diff --git a/src/test-apps/happy/test-templates/WeaveWdmNext.py b/src/test-apps/happy/test-templates/WeaveWdmNext.py
index 01bcd83cb2..efa4a36f8d 100644
--- a/src/test-apps/happy/test-templates/WeaveWdmNext.py
+++ b/src/test-apps/happy/test-templates/WeaveWdmNext.py
@@ -27,200 +27,75 @@
 import sys
 import time
 
+from happy.HappyNode import HappyNode
+from happy.HappyNetwork import HappyNetwork
 from happy.ReturnMsg import ReturnMsg
 from happy.Utils import *
 from happy.utils.IP import IP
-from happy.HappyNode import HappyNode
-from happy.HappyNetwork import HappyNetwork
 
+
+from functools import reduce
 from WeaveTest import WeaveTest
-import WeaveUtilities
 import plugins.plaid.Plaid as Plaid
-
-options = { "clients": None,
-            "server": None,
-            "quiet": False,
-            "tap": None,
-            "wdm_option": None,
-            "strace": True,
-            "plaid": "auto",
-            "timeout": None,
-            "enable_client_stop": True,
-            "save_client_perf": False,
-            "client_faults": None,
-            "server_faults": None,
-            "client_event_generator": False,
-            "client_inter_event_period": None,
-            "enable_server_stop": False,
-            "save_server_perf": False,
-            "server_event_generator": None,
-            "server_inter_event_period": None,
-            "wdm_client_liveness_check_period": None,
-            "wdm_server_liveness_check_period": None,
-            "wdm_subless_notify_dest_node": None,
-            "case": False,
-            "enable_retry": False,
-            "case_cert_path": None,
-            "enable_mock_event_timestamp_initial_counter": False,
-            "case_key_path": None,
-            "group_enc": False,
-            "group_enc_key_id": None,
-            "use_persistent_storage": True,
-            "total_client_count": None,
-            "total_server_count": None,
-            "final_client_status": None,
-            "final_server_status": None,
-            "timer_client_period": None,
-            "timer_server_period": None,
-            "test_client_iterations": None,
-            "test_server_iterations": None,
-            "test_client_delay": None,
-            "test_server_delay": None,
-            "enable_client_flip": None,
-            "enable_server_flip": None,
-            "client_update_mutation": None,
-            "client_update_conditionality": None,
-            "client_update_timing": None,
-            "client_update_num_mutations": None,
-            "client_update_num_repeated_mutations": None,
-            "client_update_num_traits": None,
-            "client_update_discard_on_error": False,
-          }
+import WeaveUtilities
+import WeaveWdmNextOptions as wwno
 
 
 def option():
-    return options.copy()
+    return wwno.OPTIONS.copy()
 
 
 class WeaveWdmNext(HappyNode, HappyNetwork, WeaveTest):
     """
-     Runs a WDM test  between a client and a server. The following options are supported.
-
-     test_client_case, test_server_case:
-
-       Maps to --test-case
-       Controls which traits are published and subscribed to.
-       The same value needs to be specified for both, for the subscriptions to work
-
-
-     total_client_count, total_server_count:
-
-       Maps to --total-count
-       The number of times the node will mutate the trait instance per iteration;
-       The frequency of the mutations is controlled by timer_server_period and timer_client_period
-       Note that the server sends a custom command at the same time it mutates the trait instance.
-       The command type alternates between 1 and 2. Command 1 is served immediately by the client;
-       Command 2 is executed with a delay (the client sends a kMsgType_InProgress).
-
-
-     timer_server_period, timer_client_period:
-
-       Maps to --timer-period
-       The period of the trait instance mutations.
-
-
-     final_client_status, final_server_status:
-
-       Maps to --final-status, with the following values:
-       0(client cancel), 1(publisher cancel), 2(client abort), 3(Publisher abort), 4(Idle)
-       This parameter controls what ends the test iteration. Both the client and the server have
-       a subscription client and a subscription handler (publisher). The node will terminate the
-       iteration with a Cancel or Abort, after either its publisher or its client have performed
-       all mutations and have become Idle.
-       A value of 4(Idle) means that the node will just wait for the other node to act.
-
-
-     test_client_iterations:
-
-       Maps to --test-iterations on the client node
-       The number of times the test sequence (establish subscriptions, mutate N times,
-       cancel or abort) should be repeated.
-
-
-     test_server_iterations:
-
-       Maps to --test-iterations on the server node
-       This is 1 by default and our tests never change it, since the tests are driven from
-       the client side and the server node is passive.
-
-
-     test_client_delay, test_server_delay:
-
-       Maps to --test-delay.
-       The nodes will sleep for the given number of milliseconds between iterations
-       Currently, this needs to be more than 2 seconds if the server is sending commands, since the
-       client executes command type 2 with a delay of 2 seconds.
-
-
-     client_clear_state_between_iterations, server_clear_state_between_iterations:
-
-       Maps to --clear-state-between-iterations
-       Resets the state of the data sink after each iteration
-
-
-     enable_client_stop, enable_server_stop:
-
-       Maps to --enable-stop
-       Controls whether the process will exit the iteration or not at the end of the iteration
-       This is always enabled on the client, and disabled on the server; the caller should
-       not need to change these values.
-
-
-     client_event_generator, server_event_generator:
-
-       Maps to --event-generator
-       Controls the event generator (None | Debug | Livenesss | Security | Telemetry | TestTrait)
-       running in the node's background.
-       See the option help string in TestWdmNext.cpp. The frequency at which events are generated
-       is controlled by client_inter_event_period and server_inter_event_period
-
-
-     client_inter_event_period, server_inter_event_period:
-
-       Maps to --inter-event-period
-       The period used by the event generator in milliseconds
+     Runs a WDM test  between a client and a server.
     """
 
-    def __init__(self, opts=options):
+    def __init__(self, opts=option()):
+        """
+        Initialize test parameters and plaid.
+
+        Args:
+          options (dict): Test parameters.
+        """
         HappyNode.__init__(self)
         HappyNetwork.__init__(self)
         WeaveTest.__init__(self)
 
-        self.__dict__.update(opts)
-
+        self.options = opts
         self.no_service = False
-
-        self.server_process_tag = "WEAVE_WDM_SERVER" + (opts["test_tag"] if "test_tag" in opts else "")
-        self.client_process_tag = "WEAVE_WDM_CLIENT" + (opts["test_tag"] if "test_tag" in opts else "")
-        self.plaid_server_process_tag = "PLAID_SERVER" + (opts["test_tag"] if "test_tag" in opts else "")
-
+        self.server_process_tag = "WEAVE_WDM_SERVER" + \
+            self.options[wwno.TEST].get(wwno.TEST_TAG, "")
+        self.client_process_tag = "WEAVE_WDM_CLIENT" + \
+            self.options[wwno.TEST].get(wwno.TEST_TAG, "")
+        self.plaid_server_process_tag = "PLAID_SERVER" + \
+            self.options[wwno.TEST].get(wwno.TEST_TAG, "")
         self.client_node_id = None
         self.server_node_id = None
-
         self.clients_info = []
-
         self.wdm_client_option = None
         self.wdm_server_option = None
 
         plaid_opts = Plaid.default_options()
-        plaid_opts["quiet"] = self.quiet
+        plaid_opts["quiet"] = self.options[wwno.TEST][wwno.QUIET]
         self.plaid_server_node_id = "node03"
         plaid_opts["server_node_id"] = self.plaid_server_node_id
         plaid_opts["num_clients"] = 2
         plaid_opts["server_ip_address"] = self.getNodeWeaveIPAddress(self.plaid_server_node_id)
-        plaid_opts["strace"] = self.strace
+        plaid_opts["strace"] = self.options[wwno.TEST][wwno.STRACE]
         self.plaid = Plaid.Plaid(plaid_opts)
 
-        self.use_plaid = opts["plaid"]
-        if opts["plaid"] == "auto":
-            if self.server == "service":
-                # can't use plaid when talking to an external service
+        self.use_plaid = self.options[wwno.TEST][wwno.PLAID]
+        if self.use_plaid == "auto":
+            if self.options[wwno.TEST][wwno.SERVER] == "service":
+                # Can't use plaid when talking to an external service
                 self.use_plaid = False
             else:
                 self.use_plaid = self.plaid.isPlaidConfigured()
 
-
     def __pre_check(self):
+        """
+        Perform set of checks to before running Wdm next tests.
+        """
         # Make sure that fabric was created
         if self.getFabricId() == None:
             emsg = "Weave Fabric has not been created yet."
@@ -228,28 +103,29 @@ def __pre_check(self):
             sys.exit(1)
 
         # Check if Weave WDM server node is given.
-        if self.server == None:
+        if not self.options[wwno.TEST][wwno.SERVER]:
             emsg = "Missing name or address of the WeaveWdmNext server node."
             self.logger.error("[localhost] WeaveWdmNext: %s" % (emsg))
             sys.exit(1)
 
         # Check if WeaveWdmNext server node exists.
-        if self._nodeExists(self.server):
-            self.server_node_id = self.server
+        if self._nodeExists(self.options[wwno.TEST][wwno.SERVER]):
+            self.server_node_id = self.options[wwno.TEST][wwno.SERVER]
             self.server_process_tag = self.server_node_id + "_" + self.server_process_tag
 
         # Check if server is provided in a form of IP address
-        if IP.isIpAddress(self.server):
+        if IP.isIpAddress(self.options[wwno.TEST][wwno.SERVER]):
             self.no_service = True
-            self.server_ip = self.server
-            self.server_weave_id = self.IPv6toWeaveId(self.server)
-        elif IP.isDomainName(self.server) or self.server == "service":
+            self.server_ip = self.options[wwno.TEST][wwno.SERVER]
+            self.server_weave_id = self.IPv6toWeaveId(self.options[wwno.TEST][wwno.SERVER])
+        elif IP.isDomainName(self.options[wwno.TEST][wwno.SERVER]) \
+                or self.options[wwno.TEST][wwno.SERVER] == "service":
             self.no_service = True
             self.server_ip = self.getServiceWeaveIPAddress("DataManagement")
             self.server_weave_id = self.IPv6toWeaveId(self.server_ip)
         else:
             # Check if server is a true cloud service instance
-            if self.getNodeType(self.server) == self.node_type_service:
+            if self.getNodeType(self.options[wwno.TEST][wwno.SERVER]) == self.node_type_service:
                 self.no_service = True
 
         if not self.no_service and self.server_node_id is None:
@@ -275,12 +151,12 @@ def __pre_check(self):
             self.logger.error("[localhost] WeaveWdmNext: %s" % emsg)
             sys.exit(1)
 
-        for client in self.clients:
+        for client in self.options[wwno.TEST][wwno.CLIENT]:
             client_node_id = None
             client_ip = None
             client_weave_id = None
             # Check if Weave Wdm Next client node is given.
-            if client == None:
+            if client is None:
                 emsg = "Missing name or address of the WeaveWdmNext client node."
                 self.logger.error("[localhost] WeaveWdmNext: %s" % (emsg))
                 sys.exit(1)
@@ -317,18 +193,18 @@ def __pre_check(self):
             self.clients_info.append({"client": client, "client_node_id": client_node_id, "client_ip": client_ip,
                                       "client_weave_id": client_weave_id, "client_process_tag": client + "_" + self.client_process_tag})
 
-        if self.wdm_option == "view":
+        if self.options[wwno.TEST][wwno.WDM_OPTION] == "view":
             self.wdm_client_option = " --wdm-simple-view-client"
             self.wdm_server_option = " --wdm-simple-view-server"
             print "view disabled"
             sys.exit(1)
-        elif self.wdm_option == "one_way_subscribe":
+        elif self.options[wwno.TEST][wwno.WDM_OPTION] == "one_way_subscribe":
             self.wdm_client_option = " --wdm-one-way-sub-client"
             self.wdm_server_option = " --wdm-one-way-sub-publisher"
-        elif self.wdm_option == "mutual_subscribe":
+        elif self.options[wwno.TEST][wwno.WDM_OPTION] == "mutual_subscribe":
             self.wdm_client_option = " --wdm-init-mutual-sub"
             self.wdm_server_option = " --wdm-resp-mutual-sub"
-        elif self.wdm_option == "subless_notify":
+        elif self.options[wwno.TEST][wwno.WDM_OPTION] == "subless_notify":
             self.wdm_client_option = " --wdm-simple-subless-notify-client"
             self.wdm_server_option = " --wdm-simple-subless-notify-server"
         else:
@@ -337,51 +213,91 @@ def __pre_check(self):
             sys.exit(1)
 
     def __process_results(self, client_output, server_output, client_info):
+        """
+        Check for parser errors and leaks on client and server.
+
+        Args:
+            client_output (str): Log output from client node.
+            server_output (str): Log output from server node.
+            client_info (dict): Client node information.
+
+        Returns:
+            dict: Results of client/server parser error and leaks.
+        """
         client_parser_error = None
         client_leak_detected = None
         server_parser_error = None
         server_leak_detected = None
         result = {}
-        client_parser_error, client_leak_detected = WeaveUtilities.scan_for_leaks_and_parser_errors(client_output)
+        client_parser_error, client_leak_detected = WeaveUtilities.scan_for_leaks_and_parser_errors(
+            client_output)
         result["no_client_parser_error"] = not client_parser_error
         result["no_client_leak_detected"] = not client_leak_detected
-        if server_output is not "":
-            server_parser_error, server_leak_detected = WeaveUtilities.scan_for_leaks_and_parser_errors(server_output)
+        if server_output:
+            server_parser_error, server_leak_detected = WeaveUtilities.scan_for_leaks_and_parser_errors(
+                server_output)
             result["no_server_parser_error"] = not client_parser_error
             result["no_server_leak_detected"] = not server_leak_detected
 
-        if self.quiet is False:
+        if not self.options[wwno.TEST][wwno.QUIET]:
             print "weave-wdm-next %s from node %s (%s) to node %s (%s) : "\
-                  % (self.wdm_option, client_info["client_node_id"], client_info["client_ip"], self.server_node_id, self.server_ip)
+                  % (self.options[wwno.TEST][wwno.WDM_OPTION],
+                     client_info["client_node_id"], client_info["client_ip"],
+                     self.server_node_id, self.server_ip)
 
-            if client_parser_error is True:
+            if client_parser_error:
                 print hred("client parser error")
-            if client_leak_detected is True:
+            if client_leak_detected:
                 print hred("client_resource leak detected")
-            if server_parser_error is True:
+            if server_parser_error:
                 print hred("server parser error")
-            if server_leak_detected is True:
+            if server_leak_detected:
                 print hred("server resource leak detected")
 
         return result
 
-
     def wdm_next_checksum_check_process(self, log):
-        """Pull out checksum value list for each trait object sent or received."""
-        checksum_list= re.findall("Checksum is (\w+)", log)
-        return checksum_list
+        """
+        Pull out checksum value list for each trait object sent or received.
 
+        Args:
+            log (str): Logs from client/server node.
+
+        Returns:
+          list: List of checksum values.
+        """
+        checksum_list = re.findall("Checksum is (\w+)", log)
+        return checksum_list
 
     def wdm_next_client_event_sequence_process(self, log):
-        """Pull out the number of events sent in a notification.  Only notifications with non-zero events are reported"""
+        """
+        Pull out the number of events sent in a notification.
+        Only notifications with non-zero events are reported.
+
+        Args:
+            log (str): Logs from client node.
+
+        Returns:
+            dict: Publisher event list data.
+        """
         success = True
-        client_event_list= re.findall("Fetched (\d+) events", log)
+        client_event_list = re.findall("Fetched (\d+) events", log)
         client_event_process_list = [int(event) for event in client_event_list if int(event) > 0]
-        return {"client_event_list":client_event_process_list, "length": len(client_event_process_list), "success": success}
-
+        return {"client_event_list": client_event_process_list,
+                "length": len(client_event_process_list), "success": success}
 
     def wdm_next_publisher_event_sequence_process(self, log):
-        """Pull out the number of events received in a notification. All notifications with EventList element are reported.  It would be considered an error to receive an empty EventList"""
+        """
+        Pull out the number of events received in a notification.
+        All notifications with EventList element are reported.
+        It would be considered an error to receive an empty EventList.
+
+        Args:
+            log(str): Logs from publisher node node.
+
+        Returns:
+            dict: Publisher event list data.
+        """
         publisher_event_list = re.finditer("WEAVE:DMG: \tEventList =", log)
         success = True
         event_list_len = []
@@ -390,19 +306,26 @@ def wdm_next_publisher_event_sequence_process(self, log):
             endEventListMarker = re.search(".*WEAVE:DMG: \t],.*", log[startEventList:])
             if endEventListMarker:
                 endEventList = endEventListMarker.end()
-                event_list_len.append(len(re.findall("WEAVE:DMG: \t\t{", log[startEventList:(startEventList+endEventList)])))
+                event_list_len.append(
+                    len(re.findall("WEAVE:DMG: \t\t{", log[startEventList:(startEventList + endEventList)])))
             else:
                 success = False
-        return {"publisher_event_list":event_list_len, "length": len(event_list_len), "success": success}
+        return {"publisher_event_list": event_list_len,
+                "length": len(event_list_len), "success": success}
 
     def __start_plaid_server(self):
-
+        """
+        Start the plaid server.
+        """
         self.plaid.startPlaidServerProcess()
 
         emsg = "plaid-server should be running."
         self.logger.debug("[%s] WeaveWdmNext: %s" % (self.plaid_server_node_id, emsg))
 
     def __start_server_side(self):
+        """
+        Configure server side node with server test parameters.
+        """
         if self.no_service:
             return
         cmd = self.getWeaveWdmNextPath()
@@ -411,162 +334,79 @@ def __start_server_side(self):
         self.server_id = self.server_weave_id
         cmd += self.wdm_server_option
 
-        if self.wdm_option == "subless_notify":
+        if self.options[wwno.TEST][wwno.WDM_OPTION] == "subless_notify":
             cmd += " --wdm-subless-notify-dest-node " + self.clients_info[0]["client_weave_id"]
             cmd += " --wdm-subnet 6"
 
-        if self.enable_server_stop is True:
-            cmd += " --enable-stop "
-
-        if self.save_server_perf is True:
-            cmd += " --save-perf"
-
-        if self.wdm_subless_notify_dest_node is not None:
-            cmd += " --wdm-subless-notify-dest-node " + str(self.wdm_subless_notify_dest_node)
-
-        if self.wdm_server_liveness_check_period is not None:
-            cmd += " --wdm-liveness-check-period " + str(self.wdm_server_liveness_check_period)
-
-        if self.test_server_case is not None:
-            cmd += " --test-case " + str(self.test_server_case)
-
-        if self.total_server_count is not None:
-            cmd += " --total-count " + str(self.total_server_count)
-
-        if self.final_server_status is not None:
-            cmd += " --final-status " + str(self.final_server_status)
-
-        if self.timer_server_period is not None:
-            cmd += " --timer-period " + str(self.timer_server_period)
-
-        if self.test_server_iterations is not None:
-            cmd += " --test-iterations " + str(self.test_server_iterations)
-
-        if self.test_server_delay is not None:
-            cmd += " --test-delay " + str(self.test_server_delay)
-
-        if self.enable_server_flip is not None:
-            cmd += " --enable-flip " + str(self.enable_server_flip)
-
-        if self.server_faults != None:
-            cmd += " --faults " + self.server_faults
-
-        if self.__dict__.get("server_clear_state_between_iterations", False):
-            cmd += " --clear-state-between-iterations"
-
-        if self.server_event_generator is not None:
-            cmd += " --event-generator " + str(self.server_event_generator)
-
-        if self.server_inter_event_period is not None:
-            cmd += " --inter-event-period " + str(self.server_inter_event_period)
-
-        if self.tap:
-            cmd += " --tap-device " + self.tap
+        # Loop through server side test parameters
+        for key, value in self.options[wwno.SERVER].items():
+            if key == wwno.LOG_CHECK:
+                continue
+            if isinstance(value, bool) and value:
+                # parameter is a True/False to add CLI option
+                cmd += " --{}".format(key.replace('_', '-'))
+            elif not isinstance(value, bool) and value is not None:
+                # parameter is a value
+                cmd += " --{} {}".format(key.replace('_', '-'), value)
 
         custom_env = {}
         if self.use_plaid:
             custom_env = self.plaid.getPlaidClientLibEnv(self.server_node_id)
 
-        self.start_simple_weave_server(cmd, self.server_ip, self.server_node_id, self.server_process_tag, listen=False, strace=self.strace, env=custom_env, use_persistent_storage=self.use_persistent_storage)
-
+        self.start_simple_weave_server(
+            cmd,
+            self.server_ip,
+            self.server_node_id,
+            self.server_process_tag,
+            listen=False,
+            strace=self.options[wwno.TEST][wwno.STRACE],
+            env=custom_env,
+            use_persistent_storage=self.options[wwno.TEST][wwno.USE_PERSISTENT_STORAGE])
 
     def __start_client_side(self, client_info):
+        """
+        Configure client side node with client test parameters.
+
+        Args:
+            client_info(dict): Holds client node information.
+        """
         cmd = self.getWeaveWdmNextPath()
         if not cmd:
             return
         cmd += self.wdm_client_option
 
-        if self.wdm_option != "subless_notify":
+        if self.options[wwno.TEST][wwno.WDM_OPTION] != "subless_notify":
             cmd += " --wdm-publisher " + self.server_weave_id
-
-        if self.enable_client_stop is True:
-            cmd += " --enable-stop "
-
-        if self.save_client_perf is True:
-            cmd += " --save-perf"
-
-        if self.wdm_client_liveness_check_period is not None:
-            cmd += " --wdm-liveness-check-period " + str(self.wdm_client_liveness_check_period)
-
-        if self.enable_client_dictionary_test is not None:
-            cmd += " --enable-dictionary-test "
-
-        if self.test_client_case is not None:
-            cmd += " --test-case " + str(self.test_client_case)
-
-        if self.total_client_count is not None:
-            cmd += " --total-count " + str(self.total_client_count)
-
-        if self.final_client_status is not None:
-            cmd += " --final-status " + str(self.final_client_status)
-
-        if self.timer_client_period is not None:
-            cmd += " --timer-period " + str(self.timer_client_period)
-
-        if self.test_client_iterations is not None:
-            cmd += " --test-iterations " + str(self.test_client_iterations)
-
-        if self.test_client_delay is not None:
-            cmd += " --test-delay " + str(self.test_client_delay)
-
-        if self.enable_client_flip is not None:
-            cmd += " --enable-flip " + str(self.enable_client_flip)
-
-        if self.__dict__.get("client_clear_state_between_iterations", False):
-            cmd += " --clear-state-between-iterations"
-
-        if self.client_faults != None:
-            cmd += " --faults " + self.client_faults
-
-        if self.tap:
-            cmd += " --tap-device " + self.tap
-
-        if self.server == "service":
+        if self.options[wwno.TEST][wwno.SERVER] == "service":
             node_id = client_info["client_weave_id"]
             fabric_id = self.getFabricId()
             client_info["client_ip"] = None
             cmd += " --wdm-subnet 5 --node-id=%s --fabric-id %s " % (node_id, fabric_id)
-
-        if self.client_event_generator is not None:
-            cmd += " --event-generator " + str(self.client_event_generator)
-
-        if self.client_inter_event_period is not None:
-            cmd += " --inter-event-period " + str(self.client_inter_event_period)
-
-        if self.case:
-            self.cert_file = self.case_cert_path if self.case_cert_path else os.path.join(self.main_conf["log_directory"], node_id.upper() + "-cert.weave-b64")
-            self.key_file = self.case_key_path if self.case_key_path else os.path.join(self.main_conf["log_directory"], node_id.upper() + "-key.weave-b64")
-            cmd += " --case " + " --node-cert " + self.cert_file + " --node-key " + self.key_file
-
-        if self.group_enc:
-            cmd += ' --group-enc ' + ' --group-enc-key-id ' + self.group_enc_key_id
-
-        if self.enable_retry:
-            cmd += " --enable-retry"
-
-        if self.enable_mock_event_timestamp_initial_counter:
-            cmd += " --enable-mock-event-timestamp-initial-counter"
-
-        if self.client_update_mutation:
-            cmd += " --wdm-update-mutation " + self.client_update_mutation
-
-        if self.client_update_conditionality:
-            cmd += " --wdm-update-conditionality " + self.client_update_conditionality
-
-        if self.client_update_timing:
-            cmd += " --wdm-update-timing " + self.client_update_timing
-
-        if self.client_update_num_mutations:
-            cmd += " --wdm-update-number-of-mutations " + str(self.client_update_num_mutations)
-
-        if self.client_update_num_repeated_mutations:
-            cmd += " --wdm-update-number-of-repeated-mutations " + str(self.client_update_num_repeated_mutations)
-
-        if self.client_update_num_traits:
-            cmd += " --wdm-update-number-of-traits " + str(self.client_update_num_traits)
-
-        if self.client_update_discard_on_error:
-            cmd += " --wdm-update-discard-on-error"
+        if self.options[wwno.CLIENT][wwno.CASE]:
+            cert_file = self.options[wwno.CLIENT][wwno.CASE_CERT_PATH] or os.path.join(
+                self.main_conf["log_directory"], node_id.upper() + "-cert.weave-b64")
+            key_file = self.options[wwno.CLIENT][wwno.CASE_KEY_PATH] or os.path.join(
+                self.main_conf["log_directory"], node_id.upper() + "-key.weave-b64")
+            cmd += " --{} --{} {} --{} {}".format(
+                wwno.CASE, wwno.CASE_CERT_PATH.replace('_', '-'),
+                cert_file, wwno.CASE_KEY_PATH.replace('_', '-'), key_file)
+        if self.options[wwno.CLIENT][wwno.GROUP_ENC]:
+            cmd += ' --{} --{} {}'.format(
+                wwno.GROUP_ENC.replace('_', '-'), wwno.GROUP_ENC_KEY_ID.replace('_', '-'),
+                self.options[wwno.CLIENT][wwno.GROUP_ENC_KEY_ID])
+
+        # Loop through client side test parameters
+        for key, value in self.options[wwno.CLIENT].items():
+            if key in [wwno.CASE, wwno.CASE_CERT_PATH, wwno.CASE_KEY_PATH,
+                       wwno.GROUP_ENC, wwno.GROUP_ENC_KEY_ID, wwno.LOG_CHECK]:
+                    # already dealt with this special case
+                continue
+            if isinstance(value, bool) and value:
+                # parameter is a True/False to add CLI option
+                cmd += " --{}".format(key.replace('_', '-'))
+            elif not isinstance(value, bool) and value is not None:
+                # parameter is a value
+                cmd += " --{} {}".format(key.replace('_', '-'), value)
 
         custom_env = {}
 
@@ -574,40 +414,64 @@ def __start_client_side(self, client_info):
             try:
                 print "cmd = \n" + cmd
                 print "sleeping..."
-                time.sleep(60*60)
+                time.sleep(60 * 60)
             except:
                 print "sleep interrupted"
 
         if self.use_plaid:
             custom_env = self.plaid.getPlaidClientLibEnv(client_info["client_node_id"])
 
-        self.start_simple_weave_client(cmd, client_info["client_ip"], None, None, client_info["client_node_id"],
-                                       client_info["client_process_tag"], strace=self.strace, env=custom_env, use_persistent_storage=self.use_persistent_storage)
-
+        self.start_simple_weave_client(cmd, client_info["client_ip"], None, None,
+                                       client_info["client_node_id"],
+                                       client_info["client_process_tag"],
+                                       strace=self.options[wwno.TEST][wwno.STRACE],
+                                       env=custom_env,
+                                       use_persistent_storage=self.options[wwno.TEST][wwno.USE_PERSISTENT_STORAGE])
 
     def __wait_for_client(self, client_info):
-        self.wait_for_test_to_end(client_info["client_node_id"], client_info["client_process_tag"], quiet=False, timeout=self.timeout)
-
+        """
+        Wait for client to finish test execution.
+
+        Args:
+            client_info(dict): Holds client node data.
+        """
+        self.wait_for_test_to_end(
+            client_info["client_node_id"],
+            client_info["client_process_tag"],
+            quiet=False,
+            timeout=self.options[wwno.TEST][wwno.TIMEOUT])
 
     def __stop_server_side(self):
+        """
+        Stop weave process on server node.
+        """
         if self.no_service:
             return
 
         self.stop_weave_process(self.server_node_id, self.server_process_tag)
 
-
     def __stop_client_side(self):
+        """
+        Stop weave process on client node.
+        """
         if self.no_service:
             return
 
         self.stop_weave_process(self.client_node_id, self.client_process_tag)
 
-
     def __stop_plaid_server(self):
+        """
+        Stop the plaid server.
+        """
         self.plaid.stopPlaidServerProcess()
 
-
     def run_client_test(self):
+        """
+        Run Weave wdm next test with test parameters.
+
+        Returns:
+            ReturnMsg: Test run results data.
+        """
         all_data = []
         success = True
         self.__pre_check()
@@ -626,10 +490,16 @@ def run_client_test(self):
             self.__wait_for_client(client_info)
         for client_info in self.clients_info:
             client_output_value, client_output_data = \
-                self.get_test_output(client_info["client_node_id"], client_info["client_process_tag"], True)
-            if self.strace:
+                self.get_test_output(
+                    client_info["client_node_id"],
+                    client_info["client_process_tag"],
+                    True)
+            if self.options[wwno.TEST][wwno.STRACE]:
                 client_strace_value, client_strace_data = \
-                        self.get_test_strace(client_info["client_node_id"], client_info["client_process_tag"], True)
+                    self.get_test_strace(
+                        client_info["client_node_id"],
+                        client_info["client_process_tag"],
+                        True)
 
             if self.no_service:
                 server_output_data = ""
@@ -640,26 +510,23 @@ def run_client_test(self):
                     self.__stop_plaid_server()
                 server_output_value, server_output_data = \
                     self.get_test_output(self.server_node_id, self.server_process_tag, True)
-                if self.strace:
+                if self.options[wwno.TEST][wwno.STRACE]:
                     server_strace_value, server_strace_data = \
-                            self.get_test_strace(self.server_node_id, self.server_process_tag, True)
+                        self.get_test_strace(self.server_node_id, self.server_process_tag, True)
 
-            success_dic = self.__process_results(client_output_data, server_output_data, client_info)
+            success_dic = self.__process_results(
+                client_output_data, server_output_data, client_info)
 
             success = reduce(lambda x, y: x and y, success_dic.values())
 
-
             data = {}
             data.update(client_info)
             data["client_output"] = client_output_data
             data["server_output"] = server_output_data
-            if self.strace:
+            if self.options[wwno.TEST][wwno.STRACE]:
                 data["client_strace"] = client_strace_data
                 data["server_strace"] = server_strace_data
             data["success_dic"] = success_dic
             all_data.append(data)
 
         return ReturnMsg(success, all_data)
-
-    def run(self):
-        return self.run_client_test()
diff --git a/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py b/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py
new file mode 100644
index 0000000000..bbfbd7b74e
--- /dev/null
+++ b/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py
@@ -0,0 +1,177 @@
+#!/usr/bin/env python
+
+"""
+Defines all test parameter options for WeaveWdmNext automation.
+Client and Server options map to MockWdmNode CLI options.
+"""
+
+# Test Options
+# Client nodes
+CLIENTS = "clients"
+# Whether to use plaid
+PLAID = "plaid"
+# Control test result output
+QUIET = "quiet"
+# Server nodes
+SERVER = "server"
+# Whether to use strace
+STRACE = "strace"
+# Name of test case
+TEST_CASE_NAME = "test_case_name"
+# Time to wait for test end
+TIMEOUT = "timeout"
+# Option for using persistent storage
+USE_PERSISTENT_STORAGE = "use_persistent_storage"
+# Type of weave subscription
+WDM_OPTION = "wdm_option"
+# Tag to denote test type
+TEST_TAG = "test_tag"
+
+"""
+Client/Server SHARED Options
+"""
+# Resets the state of the data sink after each iteration
+CLEAR_STATE_BETWEEN_ITERATIONS = "clear_state_between_iterations"
+# Enable/disable flip trait data in HandleDataFlipTimeout
+ENABLE_FLIP = "enable_flip"
+# Controls whether the process will exit the iteration or not at the end of the iteration
+ENABLE_STOP = "enable_stop"
+# Controls the event generator (None | Debug | Livenesss | Security | Telemetry | TestTrait)
+# running in the node's background.
+EVENT_GENERATOR = "event_generator"
+# Fault injections
+FAULTS = "faults"
+# Control what ends the test iteration
+# 0(client cancel), 1(publisher cancel), 2(client abort), 3(Publisher abort), 4(Idle)
+FINAL_STATUS = "final_status"
+# Period of time (milliseconds) between events
+INTER_EVENT_PERIOD = "inter_event_period"
+# Specify time (seconds) between liveness checks in WDM subscription as publisher
+LIVENESS_CHECK_PERIOD = "wdm_liveness_check_period"
+# Save wdm perf data in files
+SAVE_PERF = "save_perf"
+TAP = "tap_device"
+# Controls which traits are published and subscribed to, values must be same between client/server
+TEST_CASE = "test_case"
+# Period of time (milliseconds) between iterations
+TEST_DELAY = "test_delay"
+# Number of times test sequence is repeated
+TEST_ITERATIONS = "test_iterations"
+# Period of time between trait instance mutations
+TIMER_PERIOD = "timer_period"
+# Number of times the node will mutate the trait instance per iteration
+TOTAL_COUNT = "total_count"
+# Logs to verify on node
+LOG_CHECK = "log_check"
+
+"""
+Client ONLY Options
+"""
+CASE = "case"
+# File containing Weave certificate to authenticate the node
+CASE_CERT_PATH = "node_cert"
+# File containing private key to authenticate the node
+CASE_KEY_PATH = "node_key"
+# Enable/disable dictionary tests
+ENABLE_DICTIONARY_TEST = "enable_dictionary_test"
+# Enable automatic subscription retries by WDM
+ENABLE_RETRY = "enable_retry"
+# Enable mock event initial counter using timestamp
+ENABLE_MOCK_EVENT_TIMESTAMP_INITIAL_COUNTER = "enable_mock_event_timestamp_initial_counter"
+# Use group key to encrypt messages
+GROUP_ENC = "group_enc"
+# Key to encrypt messages
+GROUP_ENC_KEY_ID = "group_enc_key_id"
+# The conditionality of the update (conditional | unconditional | mixed | alternate)
+UPDATE_CONDITIONALITY = "wdm_update_conditionality"
+# Client discards the paths on which SetUpdated was called in case of error
+UPDATE_DISCARD_ERROR = "wdm_update_discard_on_error"
+# The first mutation to apply to each trait instance
+UPDATE_MUTATION = "wdm_update_mutation"
+# Number of mutations performed in same context
+UPDATE_NUM_MUTATIONS = "wdm_update_number_of_mutations"
+# How many times same mutation is applied before moving on
+UPDATE_NUM_REPEATED_MUTATIONS = "wdm_update_number_of_repeated_mutations"
+# Number of traits to mutate (1-4)
+UPDATE_NUM_TRAITS = "wdm_update_number_of_traits"
+# Controls when first mutation is applied and flushed
+UPDATE_TIMING = "wdm_update_timing"
+
+
+"""
+Server ONLY Options
+"""
+# Node ID of the destination node
+WDM_SUBLESS_NOTIFY_DEST_NODE = "wdm_subless_notify_dest_node"
+
+# Options top level keys
+CLIENT = "client_options"
+SERVER = "server_options"
+TEST = "test_options"
+
+OPTIONS = {
+    CLIENT: {
+        CASE: False,
+        CASE_CERT_PATH: None,
+        CASE_KEY_PATH: None,
+        CLEAR_STATE_BETWEEN_ITERATIONS: False,
+        ENABLE_DICTIONARY_TEST: True,
+        ENABLE_FLIP: None,
+        ENABLE_RETRY: False,
+        ENABLE_STOP: True,
+        ENABLE_MOCK_EVENT_TIMESTAMP_INITIAL_COUNTER: True,
+        EVENT_GENERATOR: None,
+        FAULTS: None,
+        FINAL_STATUS: None,
+        GROUP_ENC: False,
+        GROUP_ENC_KEY_ID: None,
+        INTER_EVENT_PERIOD: None,
+        LIVENESS_CHECK_PERIOD: None,
+        SAVE_PERF: False,
+        TAP: None,
+        TEST_CASE: 1,
+        TEST_DELAY: None,
+        TEST_ITERATIONS: None,
+        TIMER_PERIOD: None,
+        TOTAL_COUNT: None,
+        UPDATE_CONDITIONALITY: None,
+        UPDATE_DISCARD_ERROR: False,
+        UPDATE_MUTATION: None,
+        UPDATE_NUM_MUTATIONS: None,
+        UPDATE_NUM_REPEATED_MUTATIONS: None,
+        UPDATE_NUM_TRAITS: None,
+        UPDATE_TIMING: None,
+        LOG_CHECK: []
+    },
+    SERVER: {
+        CLEAR_STATE_BETWEEN_ITERATIONS: False,
+        ENABLE_FLIP: None,
+        ENABLE_STOP: False,
+        EVENT_GENERATOR: None,
+        FAULTS: None,
+        FINAL_STATUS: None,
+        INTER_EVENT_PERIOD: None,
+        LIVENESS_CHECK_PERIOD: None,
+        SAVE_PERF: False,
+        TAP: None,
+        TEST_CASE: 1,
+        TEST_DELAY: 0,
+        TEST_ITERATIONS: None,
+        TIMER_PERIOD: None,
+        TOTAL_COUNT: None,
+        WDM_SUBLESS_NOTIFY_DEST_NODE: None,
+        LOG_CHECK: []
+    },
+    TEST: {
+        CLIENTS: None,
+        PLAID: "auto",
+        QUIET: True,
+        SERVER: None,
+        STRACE: False,
+        TEST_CASE_NAME: [],
+        TIMEOUT: 60 * 15,
+        WDM_OPTION: None,
+        USE_PERSISTENT_STORAGE: True,
+        TEST_TAG: None
+    }
+}
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py
index bbf0e65c8a..1da69399e8 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py
@@ -30,32 +30,15 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_01(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_01(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-E01: Mutual Subscribe: Root path. Null Version. Client in initiator cancels',
-                                           'Wdm-NestService-M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels']
 
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E01 and M01"
-        super(test_weave_wdm_next_service_mutual_subscribe_01, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_01,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_02.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_02.py
index 1a864e6f9a..18e64e648b 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_02.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_02.py
@@ -30,31 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_02(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_02(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-E02: Mutual Subscribe: Root path, Null Version, Publisher in initiator Cancel',
-                                           'Wdm-NestService-M02: Stress Mutual Subscribe: Root path, Null Version, Publisher in initiator Cancel']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E02 and M02"
-        super(test_weave_wdm_next_service_mutual_subscribe_02, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_02,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_03.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_03.py
index 7875923f34..45fc5632c6 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_03.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_03.py
@@ -30,31 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_03(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_03(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-E03: Mutual Subscribe: Root path. Null Version. Client in initiator aborts',
-                                           'Wdm-NestService-M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E03 and M03"
-        super(test_weave_wdm_next_service_mutual_subscribe_03, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_03,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_04.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_04.py
index b628b904cc..838e42b5e2 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_04.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_04.py
@@ -30,31 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_04(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_04(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-E04: Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts',
-                                           'Wdm-NestService-M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E04 and M04"
-        super(test_weave_wdm_next_service_mutual_subscribe_04, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_04,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_05.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_05.py
index e88ae1c68e..1e7177e5e5 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_05.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_05.py
@@ -31,29 +31,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_05(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_05(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F01: Mutual Subscribe: Root path, Null Version, Idle, Client in initiator Cancel',
-                                           'Wdm-NestService-M05: Stress Mutual Subscribe: Root path, Null Version, Idle, Client in initiator Cancel']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F01 and M05"
-        super(test_weave_wdm_next_service_mutual_subscribe_05, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_05,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_06.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_06.py
index 2bdf7c589c..616eec40ff 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_06.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_06.py
@@ -30,30 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_06(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_06(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F02: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels',
-                                           'Wdm-NestService-M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels']
+    def test_weave_wdm_next_service_mutual_subscribe_06(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F02 and M06"
-        super(test_weave_wdm_next_service_mutual_subscribe_06, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_06,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_07.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_07.py
index 9f19242cec..53d3414a66 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_07.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_07.py
@@ -30,29 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_07(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_07(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F03: Mutual Subscribe: Root path. Null Version. Idle. Client in initiator aborts',
-                                           'Wdm-NestService-M07: Stress Mutual Subscribe: Root path. Null Version. Idle. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F03 and M07"
-        super(test_weave_wdm_next_service_mutual_subscribe_07, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_07,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_08.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_08.py
index bed400db73..faa5a513d2 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_08.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_08.py
@@ -30,28 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_08(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_08(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F04: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts',
-                                           'Wdm-NestService-M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F04 and M08"
-        super(test_weave_wdm_next_service_mutual_subscribe_08, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_08,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_09.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_09.py
index da5bf94cb9..e8086e8378 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_09.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_09.py
@@ -30,28 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_09(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_09(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F05: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels',
-                                           'Wdm-NestService-M09: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F05 and M09"
-        super(test_weave_wdm_next_service_mutual_subscribe_09, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_09,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_10.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_10.py
index 167300da27..6b4344f153 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_10.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_10.py
@@ -30,29 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_10(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_10(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F06: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator cancels',
-                                           'Wdm-NestService-M10: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F06 and M10"
-        super(test_weave_wdm_next_service_mutual_subscribe_10, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_10,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_11.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_11.py
index e8f0ba6c5e..70bfb0f47b 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_11.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_11.py
@@ -30,28 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_11(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_11(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F07: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator aborts',
-                                           'Wdm-NestService-M11: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F07 and M11"
-        super(test_weave_wdm_next_service_mutual_subscribe_11, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_11,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_12.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_12.py
index ceb3fc1e73..efc218ea43 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_12.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_12.py
@@ -30,28 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_12(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_12(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'] )]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-F08: Mutual Susbscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator aborts',
-                                           'Wdm-NestService-M12: Stress Mutual Susbscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F08 and M12"
-        super(test_weave_wdm_next_service_mutual_subscribe_12, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_12,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_13.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_13.py
index 1dce244c00..90a318c45f 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_13.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_13.py
@@ -29,31 +29,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_13(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_13(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 12 * 10
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['timeout'] = 60 * 15 * wdm_next_args['test_client_iterations']
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-M21: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Client in initiator cancels']
+    def test_weave_wdm_next_service_mutual_subscribe_13(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test M21"
-        super(test_weave_wdm_next_service_mutual_subscribe_13, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_13,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_14.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_14.py
index c070ac9d49..958d0b650c 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_14.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_14.py
@@ -29,31 +29,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_14(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_14(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 12 * 10
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['timeout'] = 60 * 15 * wdm_next_args['test_client_iterations']
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-M22: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Publisher in initiator cancels']
+    def test_weave_wdm_next_service_mutual_subscribe_14(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test M22"
-        super(test_weave_wdm_next_service_mutual_subscribe_14, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_14,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_15.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_15.py
index b4eadb9a39..c01dab98aa 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_15.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_15.py
@@ -29,31 +29,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_15(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_15(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 12 * 10
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['timeout'] = 60 * 15 * wdm_next_args['test_client_iterations']
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-M23: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Client in initiator abort']
+    def test_weave_wdm_next_service_mutual_subscribe_15(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test M21"
-        super(test_weave_wdm_next_service_mutual_subscribe_15, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_15,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_16.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_16.py
index ec0a542e88..9f59e9c7d5 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_16.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_16.py
@@ -29,31 +29,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_16(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_16(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 12 * 10
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['timeout'] = 60 * 15 * wdm_next_args['test_client_iterations']
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-M24: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Publisher in initiator aborts']
+    def test_weave_wdm_next_service_mutual_subscribe_16(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test M21"
-        super(test_weave_wdm_next_service_mutual_subscribe_16, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_16,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_17.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_17.py
index e142c6bc24..afee0dd430 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_17.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_17.py
@@ -30,31 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_17(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_17(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I01: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels',
-                                           'Wdm-NestService-M25: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels']
+    def test_weave_wdm_next_service_mutual_subscribe_17(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I01 and M25"
-        super(test_weave_wdm_next_service_mutual_subscribe_17, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_17,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_18.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_18.py
index 73867a82ff..f40d18b5ef 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_18.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_18.py
@@ -30,31 +30,15 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_18(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_18(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
+    def test_weave_wdm_next_service_mutual_subscribe_18(self):
 
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I02: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator cancels',
-                                           'Wdm-NestService-M26: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I02 and M26"
-        super(test_weave_wdm_next_service_mutual_subscribe_18, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_18,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_19.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_19.py
index a230419b3a..8a230eea60 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_19.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_19.py
@@ -30,32 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_19(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_19(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I03: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator aborts',
-                                           'Wdm-NestService-M27: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator aborts']
+    def test_weave_wdm_next_service_mutual_subscribe_19(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I03 and M27"
-        super(test_weave_wdm_next_service_mutual_subscribe_19, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_19,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_20.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_20.py
index 527e836f71..ab06dba912 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_20.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_20.py
@@ -30,32 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_20(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_20(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I04: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator aborts',
-                                           'Wdm-NestService-M28: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator aborts']
+    def test_weave_wdm_next_service_mutual_subscribe_20(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I04 and M28"
-        super(test_weave_wdm_next_service_mutual_subscribe_20, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_20,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_21.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_21.py
index c50ae7b0dc..c68b74a427 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_21.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_21.py
@@ -29,28 +29,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_21(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_21(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             # Service is always sending notification to device when device try to mutual subscription
-                                             # therefore it is set as wdm_next_args['test_client_iterations'] instead of 1, which seems not match with protocol
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-G02: Mutual Subscribe: Multiple Iterations. Mutate data in Initiator. Client in initiator aborts. Version is kept.']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test G02"
-        super(test_weave_wdm_next_service_mutual_subscribe_21, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_21,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_22.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_22.py
index b66a38017c..44e742f0ad 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_22.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_22.py
@@ -30,32 +30,15 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_22(weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_22(self):
         wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I09: Mutual Subscribe: Root path. Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels',
-                                           'Wdm-NestService-M33: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I09 and M33"
-        super(test_weave_wdm_next_service_mutual_subscribe_22, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_22,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_23.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_23.py
index a2d47efe4e..ece43dbfb7 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_23.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_23.py
@@ -30,32 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_23(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_23(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I10: Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator cancels',
-                                           'Wdm-NestService-M34: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator cancels']
+    def test_weave_wdm_next_service_mutual_subscribe_23(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I10 and M34"
-        super(test_weave_wdm_next_service_mutual_subscribe_23, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_23,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_24.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_24.py
index 6bda1517e4..28f3b1ab7a 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_24.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_24.py
@@ -30,32 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_24(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_24(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I11: Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator aborts',
-                                           'Wdm-NestService-M35: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator aborts']
+    def test_weave_wdm_next_service_mutual_subscribe_24(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I11 and M35"
-        super(test_weave_wdm_next_service_mutual_subscribe_24, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_24,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_25.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_25.py
index 863fee7cbd..d7862a4895 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_25.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_25.py
@@ -30,32 +30,14 @@
 
 
 class test_weave_wdm_next_service_mutual_subscribe_25(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_mutual_subscribe_25(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
 
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-I12: Mutual Subscribe: Root path. Initiator Continuous Events. Client in initiator aborts',
-                                           'Wdm-NestService-M36: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Client in initiator aborts']
+    def test_weave_wdm_next_service_mutual_subscribe_25(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I12 and M36"
-        super(test_weave_wdm_next_service_mutual_subscribe_25, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_25,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_application_key_01.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_application_key_01.py
index 44063ef71a..0c7cb606a5 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_application_key_01.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_mutual_subscribe_application_key_01.py
@@ -29,29 +29,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_mutual_subscribe_application_key_01(weave_wdm_next_test_service_base):
+class test_weave_wdm_next_service_mutual_subscribe_application_key_01(
+        weave_wdm_next_test_service_base):
+
     def test_weave_wdm_next_service_mutual_subscribe_application_key_01(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['test_client_case'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 10
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['client_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[.+\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-A01: Mutual Subscribe: Application key: Key distribution',
-                                           'Wdm-NestService-B01: B01: Stress Mutual Subscribe: Application key: Key distribution']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test A01 and B01"
-        super(test_weave_wdm_next_service_mutual_subscribe_application_key_01, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_mutual_subscribe_application_key_01,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_01_cond_OneLeaf.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_01_cond_OneLeaf.py
index 1328e03f7b..9a14b3c1cd 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_01_cond_OneLeaf.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_01_cond_OneLeaf.py
@@ -29,37 +29,13 @@
 
 
 class test_weave_wdm_next_service_update_01_cond_OneLeaf(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_01_cond_OneLeaf(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 1),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('unconditional update', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O01: Client creates a mutual subscription, sends one UpdateRequest to the publisher, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_01_cond_OneLeaf(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O01"
-        super(test_weave_wdm_next_service_update_01_cond_OneLeaf, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_01_cond_OneLeaf,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_02_cond_BackToBack.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_02_cond_BackToBack.py
index 2c1386c4ca..5f0d8ca0a8 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_02_cond_BackToBack.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_02_cond_BackToBack.py
@@ -29,37 +29,13 @@
 
 
 class test_weave_wdm_next_service_update_02_cond_BackToBack(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_02_cond_BackToBack(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 2
-        wdm_next_args['client_update_num_repeated_mutations'] = 2
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 2),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O02: Client creates a mutual subscription, sends two conditional UpdateRequests to the publisher back-to-back']
+    def test_weave_wdm_next_service_update_02_cond_BackToBack(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O02"
-        super(test_weave_wdm_next_service_update_02_cond_BackToBack, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_02_cond_BackToBack,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_03_uncond_OneLeaf.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_03_uncond_OneLeaf.py
index edce57f986..2110a1f4c8 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_03_uncond_OneLeaf.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_03_uncond_OneLeaf.py
@@ -29,37 +29,13 @@
 
 
 class test_weave_wdm_next_service_update_03_uncond_OneLeaf(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_03_uncond_OneLeaf(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_conditionality'] = "Unconditional"
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 1),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O03: Client creates mutual subscription, sends an unconditional UpdateRequest to publisher, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_03_uncond_OneLeaf(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O03"
-        super(test_weave_wdm_next_service_update_03_uncond_OneLeaf, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_03_uncond_OneLeaf,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_04_uncond_BackToBack.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_04_uncond_BackToBack.py
index 03b26af610..d1780e6c2b 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_04_uncond_BackToBack.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_04_uncond_BackToBack.py
@@ -29,38 +29,13 @@
 
 
 class test_weave_wdm_next_service_update_04_uncond_BackToBack(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_04_uncond_BackToBack(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_conditionality'] = "Unconditional" 
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 2
-        wdm_next_args['client_update_num_repeated_mutations'] = 2
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 2),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O02: Client creates a mutual subscription, sends two unconditional UpdateRequests to the publisher back-to-back']
+    def test_weave_wdm_next_service_update_04_uncond_BackToBack(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O04"
-        super(test_weave_wdm_next_service_update_04_uncond_BackToBack, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_04_uncond_BackToBack,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_05_cond_WholeDictionary.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_05_cond_WholeDictionary.py
index 7386280a70..71fb3f834a 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_05_cond_WholeDictionary.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_05_cond_WholeDictionary.py
@@ -29,37 +29,13 @@
 
 
 class test_weave_wdm_next_service_update_05_cond_WholeDictionary(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_05_cond_WholeDictionary(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "WholeDictionary" 
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 1),
-                                             ('Update: no more pending updates', 1),
-                                             ('replace dictionary', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O05: Client creates a mutual subscription, sends one UpdateRequest to the publisher to replace a whole dictionary, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_05_cond_WholeDictionary(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O05"
-        super(test_weave_wdm_next_service_update_05_cond_WholeDictionary, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_05_cond_WholeDictionary,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary.py
index 39651b4bc6..47fd793a7c 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary.py
@@ -31,39 +31,16 @@
 # this one, the WholeDictionary test fails because the service cancels the
 # subscription after accepting the WholeDictionary mutation.
 
-class test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "WholeLargeDictionary" 
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 1
+class test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary(
+        weave_wdm_next_test_service_base):
 
-        # note that there are two paths in the update from the point of view of
-        # the application: a leaf and the dictionary.
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 2),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O06: Client creates a mutual subscription, sends one UpdateRequest to the publisher to replace a whole dictionary, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O06"
-        super(test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits.py
index 435e57b903..2828f7f065 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits.py
@@ -30,37 +30,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
+class test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits(
+        weave_wdm_next_test_service_base):
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_num_traits'] = 2
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 2),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O07: Client creates a mutual subscription, sends one UpdateRequest to the publisher with 2 traits, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O07"
-        super(test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits.py
index 0a3b55a12c..dfbfdf0e66 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits.py
@@ -27,38 +27,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
+class test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits(
+        weave_wdm_next_test_service_base):
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_num_traits'] = 2
-        wdm_next_args['client_update_num_mutations'] = 1
-        wdm_next_args['client_update_conditionality'] = "Mixed"
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 2),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O08: Client creates a mutual subscription, sends one UpdateRequest to the publisher with 2 traits, one conditional and one not, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O08"
-        super(test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_09_mixed_SameLevelLeafs_multi_traits.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_09_mixed_SameLevelLeafs_multi_traits.py
index 7c008ac18b..fae1315015 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_09_mixed_SameLevelLeafs_multi_traits.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_09_mixed_SameLevelLeafs_multi_traits.py
@@ -27,40 +27,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_update_09_mixed_SameLevelLeaves_multi_traits(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_09_mixed_SameLevelLeaves_multi_traits(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
-
-        wdm_next_args['client_update_mutation'] = "SameLevelLeaves" 
-        wdm_next_args['client_update_num_traits'] = 2
-        wdm_next_args['client_update_num_mutations'] = 1
-        wdm_next_args['client_update_conditionality'] = "Mixed"
+class test_weave_wdm_next_service_update_09_mixed_SameLevelLeaves_multi_traits(
+        weave_wdm_next_test_service_base):
 
-        # The update will contain 3 paths for TestATrait and 1 for the Locale trait.
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 4),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O09: Client creates a mutual subscription, sends one UpdateRequest to the publisher with multiple leaves in 2 traits, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_09_mixed_SameLevelLeaves_multi_traits(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O09"
-        super(test_weave_wdm_next_service_update_09_mixed_SameLevelLeaves_multi_traits, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_09_mixed_SameLevelLeaves_multi_traits,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_10_cond_Root_multi_traits.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_10_cond_Root_multi_traits.py
index d2508e7ce0..dd8fa0e361 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_10_cond_Root_multi_traits.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_10_cond_Root_multi_traits.py
@@ -30,45 +30,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_update_10_cond_Root_multi_traits(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_10_cond_Root_multi_traits(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
+class test_weave_wdm_next_service_update_10_cond_Root_multi_traits(
+        weave_wdm_next_test_service_base):
 
-        wdm_next_args['client_update_mutation'] = "Root" 
-        wdm_next_args['client_update_num_traits'] = 4
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 4),
-                                             ('Update: no more pending updates', 1),
-                                             ('DataElement didn.*; will try again later', 1), # make sure to test failing to add a DataElement...
-                                             ('Msg sent 0000000B:44', 1),                       # ... which will cause PartialUpdateRequests to be sent
-                                             ('Msg sent 0000000B:34', 1),
-                                             ('Removed 2 private InProgress items after 3', 1), # when the second TestATrait fails to fit, we have to remove
-                                                                                                # the private paths it has generated
-                                             ('Path already present', 2),    # TestATrait's root mutation re-adds a path after adding root 
-                                                                             # (there are two instances of TestATrait)
-                                             ('replace dictionary', 0),      # All DataElements for dictionaries are "merge", not "replace" 
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O10: Client creates a mutual subscription, sends one UpdateRequest to the publisher with 4 full traits, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_10_cond_Root_multi_traits(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O10"
-        super(test_weave_wdm_next_service_update_10_cond_Root_multi_traits, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_10_cond_Root_multi_traits,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary.py
index 68ebce3616..33826bdae3 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary.py
@@ -31,38 +31,16 @@
 # this one, the WholeDictionary test fails because the service cancels the
 # subscription after accepting the WholeDictionary mutation.
 
-class test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
 
-        wdm_next_args['client_update_mutation'] = "WholeLargeDictionary" 
-        wdm_next_args['client_update_conditionality'] = "Unconditional" 
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 1
+class test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary(
+        weave_wdm_next_test_service_base):
 
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 1),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O11: Client creates a mutual subscription, sends one UpdateRequest to the publisher to replace a whole dictionary, and receives a StatusReport']
+    def test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O11"
-        super(test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub.py
index 5e5595b6a1..9be4356f44 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub.py
@@ -28,41 +28,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
+class test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub(
+        weave_wdm_next_test_service_base):
 
-        wdm_next_args['client_update_mutation'] = "OneLeaf" 
-        wdm_next_args['client_update_conditionality'] = "Unconditional"
-        wdm_next_args['client_update_timing'] = "BeforeSub"
-        wdm_next_args['client_update_num_traits'] = 1
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Potential data loss set for traitDataHandle', 0),
-                                             ('Potential data loss cleared for traitDataHandle', 0),
-                                             ('Update: path result: success', 1),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O03: Client creates mutual subscription, sends an unconditional UpdateRequest to publisher before starting the subscription']
+    def test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O12"
-        super(test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems.py
index 5823e308df..bd4ffd6339 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems.py
@@ -28,41 +28,15 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 
-class test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems(weave_wdm_next_test_service_base):
-    def test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1 
-
-        wdm_next_args['enable_retry'] = True 
-
-        wdm_next_args['client_update_mutation'] = "ManyDictionaryItems" 
-        wdm_next_args['client_update_conditionality'] = "Conditional"
-        #wdm_next_args['client_update_timing'] = "BeforeSub"
-        wdm_next_args['client_update_num_traits'] = 4
-        wdm_next_args['client_update_num_mutations'] = 1
+class test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems(
+        weave_wdm_next_test_service_base):
 
-        # 122 paths: 60 for TestATrait plus 1 for TestBTrait and  1 for Locale
-
-        wdm_next_args['client_log_check'] = [('Mutual: Good Iteration', 1),
-                                             ('Update: path result: success', 122),
-                                             ('Update: no more pending updates', 1),
-                                             ('Update: path failed', 0),
-                                             ('Need to resubscribe', 0)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__
-        wdm_next_args['test_case_name'] = ['Wdm-NestService-O13: Client creates a mutual subscription, sends a conditional UpdateRequest to publisher with many dictionary items']
+    def test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems(self):
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O13"
-        super(test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems, self).weave_wdm_next_test_service_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems,
+              self).weave_wdm_next_test_service_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_faults.py b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_faults.py
index 9fec7b0ad5..306cfb7e06 100755
--- a/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_faults.py
+++ b/src/test-apps/happy/tests/service/wdmNext/test_weave_wdm_next_service_update_faults.py
@@ -34,17 +34,19 @@
 from weave_wdm_next_test_service_base import weave_wdm_next_test_service_base
 
 import WeaveUtilities
-
-gScenarios = [ "UpdateResponseDelay", "UpdateResponseTimeout", "UpdateResponseBusyAndFailed", "CondUpdateBadVersion",
-               "UpdateRequestSendError", "UpdateRequestSendErrorInline", "UpdateRequestBadProfile", "UpdateRequestBadProfileBeforeSub",
-               "PartialUpdateRequestSendError", "PartialUpdateRequestSendErrorInline", "DiscardUpdatesOnNoResponse", "DiscardUpdatesOnStatusReport",
-               "UpdateResponseMultipleTimeout", "UpdateResponseMultipleTimeoutBeforeSub",
-               "FailBindingBeforeSub", "PathStoreFullOnSendError", "PathStoreFullOnSendErrorInline", "UpdateRequestMutateDictAndFailSendBeforeSub"]
-gConditionalities = [ "Conditional", "Unconditional", "Mixed" ]
+import WeaveWdmNextOptions as wwno
+
+gScenarios = ["UpdateResponseDelay", "UpdateResponseTimeout", "UpdateResponseBusyAndFailed", "CondUpdateBadVersion",
+              "UpdateRequestSendError", "UpdateRequestSendErrorInline", "UpdateRequestBadProfile", "UpdateRequestBadProfileBeforeSub",
+              "PartialUpdateRequestSendError", "PartialUpdateRequestSendErrorInline", "DiscardUpdatesOnNoResponse", "DiscardUpdatesOnStatusReport",
+              "UpdateResponseMultipleTimeout", "UpdateResponseMultipleTimeoutBeforeSub",
+              "FailBindingBeforeSub", "PathStoreFullOnSendError", "PathStoreFullOnSendErrorInline", "UpdateRequestMutateDictAndFailSendBeforeSub"]
+gConditionalities = ["Conditional", "Unconditional", "Mixed"]
 gFaultopts = WeaveUtilities.FaultInjectionOptions()
-gOpts = { "conditionality" : None,
-          "scenario"       : None
-          }
+gOpts = {"conditionality": None,
+         "scenario": None
+         }
+
 
 class test_weave_wdm_next_service_update_faults(weave_wdm_next_test_service_base):
 
@@ -52,9 +54,10 @@ def configure_test(self, scenario, conditionality):
 
         wdm_next_args = self.wdm_next_args
 
-        # By default, empty the arrays of strings to look for in the logs; rely on the default check for "Good Iteration"
-        wdm_next_args['client_log_check'] = []
-        wdm_next_args['server_log_check'] = []
+        # By default, empty the arrays of strings to look for in the logs; rely on
+        # the default check for "Good Iteration"
+        wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK] = []
+        wdm_next_args[wwno.SERVER][wwno.LOG_CHECK] = []
 
         # Usually we run 3 iterations; the first one or two can fail because of the fault being injected.
         # The third one should always succeed; the second one fails only because a fault that
@@ -63,7 +66,7 @@ def configure_test(self, scenario, conditionality):
         # But since running tests against the service is very slow, just run 1 iteration for now and check
         # that the failure is handled; to properly test the success-on-retry we need to improve the base class so
         # we can specify a different log_check per iteration.
-        wdm_next_args['test_client_iterations'] = 1
+        wdm_next_args[wwno.CLIENT][wwno.TEST_ITERATIONS] = 1
 
         fault_config = None
 
@@ -83,35 +86,38 @@ def configure_test(self, scenario, conditionality):
 
             if conditionality == "Conditional":
                 client_log_check = [
-                        # The UpdateRequest timeout:
-                        ("Update: path failed: Weave Error 4050: Timeout", 2),
-                        # But the service has received it and processed it;
-                        # The first notification causes a PotentialDataLoss, and purges the udpate on the trait
-                        ("Potential data loss set for traitDataHandle", 1),
-                        ("MarkFailedPendingPaths", 1),
-                        ("Update: path failed: Weave Error 4176: The conditional update of a WDM path failed for a version mismatch", 1),
-                        # The other path is retried, but it fails with VersionMismatch in the StatusReport
-                        ("Update: path failed: Weave Error 4044:.*:37", 1)]
+                    # The UpdateRequest timeout:
+                    ("Update: path failed: Weave Error 4050: Timeout", 2),
+                    # But the service has received it and processed it;
+                    # The first notification causes a PotentialDataLoss, and purges the udpate
+                    # on the trait
+                    ("Potential data loss set for traitDataHandle", 1),
+                    ("MarkFailedPendingPaths", 1),
+                    ("Update: path failed: Weave Error 4176: The conditional update of a WDM path failed for a version mismatch", 1),
+                    # The other path is retried, but it fails with VersionMismatch in the
+                    # StatusReport
+                    ("Update: path failed: Weave Error 4044:.*:37", 1)]
             elif conditionality == "Unconditional":
                 client_log_check = [
-                        # The UpdateRequest timeout:
-                        ("Update: path failed: Weave Error 4050: Timeout", 2),
-                        # The notifications are received and they mark data loss
-                        ("Potential data loss set for traitDataHandle", 2),
-                        # There is no purging
-                        ("MarkFailedPendingPaths", 0),
-                        # Finally the update succeeds:
-                        ('Update: path result: success', 2)]
+                    # The UpdateRequest timeout:
+                    ("Update: path failed: Weave Error 4050: Timeout", 2),
+                    # The notifications are received and they mark data loss
+                    ("Potential data loss set for traitDataHandle", 2),
+                    # There is no purging
+                    ("MarkFailedPendingPaths", 0),
+                    # Finally the update succeeds:
+                    ('Update: path result: success', 2)]
             elif conditionality == "Mixed":
                 client_log_check = [
-                        # The UpdateRequest timeout:
-                        ("Update: path failed: Weave Error 4050: Timeout", 2),
-                        # But the service has received it and processed it;
-                        # The notification on the conditional trait causes its update to be purged and the subscription to go down
-                        ("Potential data loss set for traitDataHandle", 1),
-                        ("MarkFailedPendingPaths", 1),
-                        # The unconditional update succeeds on retry
-                        ('Update: path result: success', 1)]
+                    # The UpdateRequest timeout:
+                    ("Update: path failed: Weave Error 4050: Timeout", 2),
+                    # But the service has received it and processed it;
+                    # The notification on the conditional trait causes its update to be purged
+                    # and the subscription to go down
+                    ("Potential data loss set for traitDataHandle", 1),
+                    ("MarkFailedPendingPaths", 1),
+                    # The unconditional update succeeds on retry
+                    ('Update: path result: success', 1)]
 
         if scenario == "UpdateResponseMultipleTimeout":
             num_failures = 2
@@ -119,42 +125,43 @@ def configure_test(self, scenario, conditionality):
 
             if conditionality == "Conditional":
                 client_log_check = [
-                        # The UpdateRequest timeout: there are 3 because it retries 2 times, but one
-                        # of the two paths gets purged at the first notification
-                        ("Update: path failed: Weave Error 4050: Timeout", 2*num_failures -1),
-                        # The service receives the message, and the first notification purges one path and causes the subscription
-                        # to go down.
-                        # Everything else depends on how quickly the subscription is re-established (service will send kStatus_Busy a couple of times)
-                        # and how the notifications interleave with the update attempts.
-                        ('Update: path result: success', 0)]
+                    # The UpdateRequest timeout: there are 3 because it retries 2 times, but one
+                    # of the two paths gets purged at the first notification
+                    ("Update: path failed: Weave Error 4050: Timeout", 2 * num_failures - 1),
+                    # The service receives the message, and the first notification purges one path and causes the subscription
+                    # to go down.
+                    # Everything else depends on how quickly the subscription is re-established (service will send kStatus_Busy a couple of times)
+                    # and how the notifications interleave with the update attempts.
+                    ('Update: path result: success', 0)]
             elif conditionality == "Unconditional":
                 client_log_check = [
-                        # The UpdateRequest timeout:
-                        ("Update: path failed: Weave Error 4050: Timeout", 2*num_failures),
-                        # We receive notifications back because the the requests receive the service:
-                        ("Potential data loss set for traitDataHandle", 2),
-                        ("MarkFailedPendingPaths", 0),
-                        ("The conditional update of a WDM path failed for a version mismatch", 0),
-                        # Finally the update succeeds:
-                        ('Update: path result: success', 2)]
+                    # The UpdateRequest timeout:
+                    ("Update: path failed: Weave Error 4050: Timeout", 2 * num_failures),
+                    # We receive notifications back because the the requests receive the
+                    # service:
+                    ("Potential data loss set for traitDataHandle", 2),
+                    ("MarkFailedPendingPaths", 0),
+                    ("The conditional update of a WDM path failed for a version mismatch", 0),
+                    # Finally the update succeeds:
+                    ('Update: path result: success', 2)]
             else:
                 client_log_check = [
-                        # only the unconditional one goes through eventually
-                        ('Update: path result: success', 1)]
+                    # only the unconditional one goes through eventually
+                    ('Update: path result: success', 1)]
 
         if scenario == "UpdateResponseMultipleTimeoutBeforeSub":
             num_failures = 2
             fault_config = "Weave_WDMUpdateRequestTimeout_s0_f" + str(num_failures)
-            wdm_next_args['client_update_timing'] = "BeforeSub"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_TIMING] = "BeforeSub"
 
             if conditionality == "Unconditional":
                 client_log_check = [
-                        # The UpdateRequest timeout:
-                        ("Update: path failed: Weave Error 4050: Timeout", 2*num_failures),
-                        # It's hard to guess what happens with multiple timeouts and the
-                        # subscription being established.
-                        # Finally the update succeeds:
-                        ('Update: path result: success', 2)]
+                    # The UpdateRequest timeout:
+                    ("Update: path failed: Weave Error 4050: Timeout", 2 * num_failures),
+                    # It's hard to guess what happens with multiple timeouts and the
+                    # subscription being established.
+                    # Finally the update succeeds:
+                    ('Update: path result: success', 2)]
             else:
                 return False
 
@@ -162,18 +169,19 @@ def configure_test(self, scenario, conditionality):
 
             fault_config = "Weave_WDMUpdateRequestSendErrorAsync_s0_f1"
 
-            # In this case, there is no significant difference between Conditional and Unconditional
+            # In this case, there is no significant difference between Conditional and
+            # Unconditional
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    ("Update: path failed: Weave Error 4099: Message not acknowledged", 2),
-                    # The update succeeds after retrying:
-                    ('Update: path result: success', 2),
-                    # when resubscribing, the notification does not trigger PotentialDataLoss:
-                    ("Potential data loss set for traitDataHandle", 0),
-                    # After the notification, no pending paths are purged
-                    ("MarkFailedPendingPaths", 0),
-                    ("The conditional update of a WDM path failed for a version mismatch", 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                ("Update: path failed: Weave Error 4099: Message not acknowledged", 2),
+                # The update succeeds after retrying:
+                ('Update: path result: success', 2),
+                # when resubscribing, the notification does not trigger PotentialDataLoss:
+                ("Potential data loss set for traitDataHandle", 0),
+                # After the notification, no pending paths are purged
+                ("MarkFailedPendingPaths", 0),
+                ("The conditional update of a WDM path failed for a version mismatch", 0)]
 
         if scenario == "PathStoreFullOnSendError":
 
@@ -181,15 +189,16 @@ def configure_test(self, scenario, conditionality):
             # is processed.
             fault_config = "Weave_WDMUpdateRequestSendErrorAsync_s0_f1:Weave_WDMPathStoreFull_s5_f1"
 
-            # In this case, there is no significant difference between Conditional and Unconditional
+            # In this case, there is no significant difference between Conditional and
+            # Unconditional
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    ("Update: path failed: Weave Error 4099: Message not acknowledged.*will retry", 2),
-                    # The PATH_STORE_FULL errors
-                    ("Update: path failed: Weave Error 4181: A WDM TraitPath store is full.*will not retry", 2),
-                    # The update never succeeds
-                    ('Update: path result: success', 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                ("Update: path failed: Weave Error 4099: Message not acknowledged.*will retry", 2),
+                # The PATH_STORE_FULL errors
+                ("Update: path failed: Weave Error 4181: A WDM TraitPath store is full.*will not retry", 2),
+                # The update never succeeds
+                ('Update: path result: success', 0)]
 
         if scenario == "PathStoreFullOnSendErrorInline":
 
@@ -197,96 +206,103 @@ def configure_test(self, scenario, conditionality):
             # is processed.
             fault_config = "Weave_WDMUpdateRequestSendErrorInline_s0_f1:Weave_WDMPathStoreFull_s5_f1"
 
-            # In this case, there is no significant difference between Conditional and Unconditional
+            # In this case, there is no significant difference between Conditional and
+            # Unconditional
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    ("Update: path failed: Inet Error.*will retry", 2),
-                    # The PATH_STORE_FULL errors
-                    ("Update: path failed: Weave Error 4181: A WDM TraitPath store is full.*will not retry", 2),
-                    # The update never succeeds
-                    ('Update: path result: success', 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                ("Update: path failed: Inet Error.*will retry", 2),
+                # The PATH_STORE_FULL errors
+                ("Update: path failed: Weave Error 4181: A WDM TraitPath store is full.*will not retry", 2),
+                # The update never succeeds
+                ('Update: path result: success', 0)]
 
         if scenario == "UpdateRequestSendErrorInline":
 
             fault_config = "Weave_WDMUpdateRequestSendErrorInline_s0_f1"
 
-            # In this case, there is no significant difference between Conditional and Unconditional
+            # In this case, there is no significant difference between Conditional and
+            # Unconditional
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    ("Update: path failed: Inet Error", 2),
-                    # The update succeeds after retrying:
-                    ('Update: path result: success', 2),
-                    # when resubscribing, the notification does not trigger PotentialDataLoss:
-                    ("Potential data loss set for traitDataHandle", 0),
-                    # After the notification, no pending paths are purged
-                    ("MarkFailedPendingPaths", 0),
-                    ("The conditional update of a WDM path failed for a version mismatch", 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                ("Update: path failed: Inet Error", 2),
+                # The update succeeds after retrying:
+                ('Update: path result: success', 2),
+                # when resubscribing, the notification does not trigger PotentialDataLoss:
+                ("Potential data loss set for traitDataHandle", 0),
+                # After the notification, no pending paths are purged
+                ("MarkFailedPendingPaths", 0),
+                ("The conditional update of a WDM path failed for a version mismatch", 0)]
 
         if scenario == "DiscardUpdatesOnNoResponse":
 
             # Inject a SendError and make the initiator discard the updates
-            wdm_next_args['client_update_mutation'] = "FewDictionaryItems"
-            wdm_next_args['client_update_discard_on_error'] = True
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_MUTATION] = "FewDictionaryItems"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_DISCARD_ERROR] = True
 
             fault_config = "Weave_WDMUpdateRequestSendErrorAsync_s0_f1"
 
-            # In this case, there is no significant difference between Conditional and WholeDictionary
+            # In this case, there is no significant difference between Conditional and
+            # WholeDictionary
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    # Note that there is only one of these instead of 5 (4 paths in one trait and 1 in the other)
-                    # because the application discards the paths at the first error.
-                    ("Update: path failed: Weave Error 4099: Message not acknowledged", 1),
-                    # Also, AbortUpdates sees all 5 paths to discard because the one triggering the notification
-                    # would have been retried.
-                    ("Discarded 0 pending  and 5 inProgress paths", 1),
-                    # The update is not retried
-                    ('Update: path result: success', 0),
-                    # when resubscribing, the notification does not trigger PotentialDataLoss:
-                    ("Potential data loss set for traitDataHandle", 0),
-                    # After the notification, no pending paths are purged
-                    ("MarkFailedPendingPaths", 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                # Note that there is only one of these instead of 5 (4 paths in one trait and 1 in the other)
+                # because the application discards the paths at the first error.
+                ("Update: path failed: Weave Error 4099: Message not acknowledged", 1),
+                # Also, AbortUpdates sees all 5 paths to discard because the one triggering the notification
+                # would have been retried.
+                ("Discarded 0 pending  and 5 inProgress paths", 1),
+                # The update is not retried
+                ('Update: path result: success', 0),
+                # when resubscribing, the notification does not trigger PotentialDataLoss:
+                ("Potential data loss set for traitDataHandle", 0),
+                # After the notification, no pending paths are purged
+                ("MarkFailedPendingPaths", 0)]
 
         if scenario == "DiscardUpdatesOnStatusReport":
 
             # Inject a SendError and make the initiator discard the updates
-            wdm_next_args['client_update_mutation'] = "FewDictionaryItems"
-            wdm_next_args['client_update_discard_on_error'] = True
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_MUTATION] = "FewDictionaryItems"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_DISCARD_ERROR] = True
 
             fault_config = "Weave_WDMSendUpdateBadVersion_s0_f1"
             if conditionality == "Conditional":
                 client_log_check = [
-                        # Note that there is one of these instead of 5 (4 paths in one trait and 1 in the other)
-                        # because the application discards the paths at the first error.
-                        ("Update: path failed: Weave Error 4044: Status Report received from peer, \[ WDM\(0000000B\):37 \]", 1),
-                        # Also, AbortUpdates only sees 4 paths to discard because the one triggering the notification
-                        # has been deleted already (it was not going to be retried).
-                        ("Discarded 0 pending  and 4 inProgress paths", 1),
-                        # The update is not retried
-                        ('Update: path result: success', 0),
-                        # when resubscribing, the notification does not trigger PotentialDataLoss:
-                        ("Potential data loss set for traitDataHandle", 0),
-                        # No resubscription from the UpdateResponse handler
-                        ("UpdateResponse: triggering resubscription", 0),
-                        # After the notification, no pending paths are purged
-                        ("MarkFailedPendingPaths", 0)]
+                    # Note that there is one of these instead of 5 (4 paths in one trait and 1 in the other)
+                    # because the application discards the paths at the first error.
+                    (
+                        "Update: path failed: Weave Error 4044: Status Report received from peer, \[ WDM\(0000000B\):37 \]",
+                        1),
+                    # Also, AbortUpdates only sees 4 paths to discard because the one triggering the notification
+                    # has been deleted already (it was not going to be retried).
+                    ("Discarded 0 pending  and 4 inProgress paths", 1),
+                    # The update is not retried
+                    ('Update: path result: success', 0),
+                    # when resubscribing, the notification does not trigger PotentialDataLoss:
+                    ("Potential data loss set for traitDataHandle", 0),
+                    # No resubscription from the UpdateResponse handler
+                    ("UpdateResponse: triggering resubscription", 0),
+                    # After the notification, no pending paths are purged
+                    ("MarkFailedPendingPaths", 0)]
             elif conditionality == "Mixed":
                 client_log_check = [
-                        # Like above, only the first trait is conditional and fails...
-                        ("Update: path failed: Weave Error 4044: Status Report received from peer, \[ WDM\(0000000B\):37 \]", 1),
-                        # Also, AbortUpdates only sees 4 paths to discard because the one triggering the notification
-                        # has been deleted already (it was not going to be retried).
-                        ("Discarded 0 pending  and 4 inProgress paths", 1),
-                        # ... but the application calls DiscardUpdates, and so it does not get notified of the success either.
-                        ('Update: path result: success', 0),
-                        # No resubscription from the UpdateResponse handler
-                        ("UpdateResponse: triggering resubscription", 0),
-                        # when resubscribing, the notification does not trigger PotentialDataLoss:
-                        ("Potential data loss set for traitDataHandle", 0),
-                        # After the notification, no pending paths are purged
-                        ("MarkFailedPendingPaths", 0)]
+                    # Like above, only the first trait is conditional and fails...
+                    (
+                        "Update: path failed: Weave Error 4044: Status Report received from peer, \[ WDM\(0000000B\):37 \]",
+                        1),
+                    # Also, AbortUpdates only sees 4 paths to discard because the one triggering the notification
+                    # has been deleted already (it was not going to be retried).
+                    ("Discarded 0 pending  and 4 inProgress paths", 1),
+                    # ... but the application calls DiscardUpdates, and so it does not get notified of the success either.
+                    ('Update: path result: success', 0),
+                    # No resubscription from the UpdateResponse handler
+                    ("UpdateResponse: triggering resubscription", 0),
+                    # when resubscribing, the notification does not trigger PotentialDataLoss:
+                    ("Potential data loss set for traitDataHandle", 0),
+                    # After the notification, no pending paths are purged
+                    ("MarkFailedPendingPaths", 0)]
             else:
                 # Can't inject a bad version in a scenarion without conditional updates
                 return False
@@ -294,66 +310,69 @@ def configure_test(self, scenario, conditionality):
         if scenario == "PartialUpdateRequestSendError":
             fault_config = "Weave_WDMUpdateRequestSendErrorAsync_s0_f1"
 
-            wdm_next_args['client_update_mutation'] = "WholeLargeDictionary"
-            wdm_next_args['client_update_num_traits'] = 1
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_MUTATION] = "WholeLargeDictionary"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_NUM_TRAITS] = 1
 
             # In this case, there is no significant difference between Conditional and Unconditional
             # One trait with two paths: a leaf and a huge dictionary.
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    ("Update: path failed: Weave Error 4099: Message not acknowledged", 2),
-                    # The update succeeds after retrying:
-                    ('Update: path result: success', 2),
-                    # The notification does not trigger PotentialDataLoss:
-                    ("Potential data loss set for traitDataHandle", 0),
-                    ("MarkFailedPendingPaths", 0),
-                    ("The conditional update of a WDM path failed for a version mismatch", 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                ("Update: path failed: Weave Error 4099: Message not acknowledged", 2),
+                # The update succeeds after retrying:
+                ('Update: path result: success', 2),
+                # The notification does not trigger PotentialDataLoss:
+                ("Potential data loss set for traitDataHandle", 0),
+                ("MarkFailedPendingPaths", 0),
+                ("The conditional update of a WDM path failed for a version mismatch", 0)]
 
         if scenario == "PartialUpdateRequestSendErrorInline":
             fault_config = "Weave_WDMUpdateRequestSendErrorInline_s0_f1"
 
-            wdm_next_args['client_update_mutation'] = "WholeLargeDictionary"
-            wdm_next_args['client_update_num_traits'] = 1
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_MUTATION] = "WholeLargeDictionary"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_NUM_TRAITS] = 1
 
             # In this case, there is no significant difference between Conditional and Unconditional
             # One trait with two paths: a leaf and a huge dictionary.
 
             client_log_check = [
-                    # The UpdateRequest SendError (note: the responder does not receive the request):
-                    ("Update: path failed: Inet Error", 2),
-                    # The update succeeds after retrying:
-                    ('Update: path result: success', 2),
-                    # The notification does not trigger PotentialDataLoss:
-                    ("Potential data loss set for traitDataHandle", 0),
-                    ("MarkFailedPendingPaths", 0),
-                    ("The conditional update of a WDM path failed for a version mismatch", 0)]
+                # The UpdateRequest SendError (note: the responder does not receive the request):
+                ("Update: path failed: Inet Error", 2),
+                # The update succeeds after retrying:
+                ('Update: path result: success', 2),
+                # The notification does not trigger PotentialDataLoss:
+                ("Potential data loss set for traitDataHandle", 0),
+                ("MarkFailedPendingPaths", 0),
+                ("The conditional update of a WDM path failed for a version mismatch", 0)]
 
         if scenario == "CondUpdateBadVersion":
             fault_config = "Weave_WDMSendUpdateBadVersion_s0_f1"
             if conditionality == "Conditional":
                 client_log_check = [
-                        # Status report "Multiple failures"
-                        ("Received StatusReport .*WDM.0000000B.:43", 1),
-                        # Both paths fail (even if the second trait has a good version - the service should really treat them separately) 
-                        # and the application is notified:
-                        ("Update: path failed: Weave Error 4044: Status Report received from peer.*WDM.0000000B.:37", 2),
-                        # The UpdateResponse handler decides to resubscribe
-                        ("UpdateResponse: triggering resubscription", 1),
-                        # In this case there are no notification while paths are pending/in-progress:
-                        ("Potential data loss set for traitDataHandle", 0)]
+                    # Status report "Multiple failures"
+                    ("Received StatusReport .*WDM.0000000B.:43", 1),
+                    # Both paths fail (even if the second trait has a good version - the service should really treat them separately)
+                    # and the application is notified:
+                    ("Update: path failed: Weave Error 4044: Status Report received from peer.*WDM.0000000B.:37", 2),
+                    # The UpdateResponse handler decides to resubscribe
+                    ("UpdateResponse: triggering resubscription", 1),
+                    # In this case there are no notification while paths are
+                    # pending/in-progress:
+                    ("Potential data loss set for traitDataHandle", 0)]
             elif conditionality == "Mixed":
                 client_log_check = [
-                        # Status report "Multiple failures"
-                        ("Received StatusReport .*WDM.0000000B.:43", 1),
-                        # The conditional path fails and the application is notified:
-                        ("Update: path failed: Weave Error 4044: Status Report received from peer.*WDM.0000000B.:37", 1),
-                        # The unconditional path succeeds:
-                        ('Update: path result: success', 1),
-                        # The UpdateResponse handler decides to resubscribe because of the failed conditional update:
-                        ("UpdateResponse: triggering resubscription", 1),
-                        # In this case there are no notification while paths are pending/in-progress:
-                        ("Potential data loss set for traitDataHandle", 0)]
+                    # Status report "Multiple failures"
+                    ("Received StatusReport .*WDM.0000000B.:43", 1),
+                    # The conditional path fails and the application is notified:
+                    ("Update: path failed: Weave Error 4044: Status Report received from peer.*WDM.0000000B.:37", 1),
+                    # The unconditional path succeeds:
+                    ('Update: path result: success', 1),
+                    # The UpdateResponse handler decides to resubscribe because of the failed
+                    # conditional update:
+                    ("UpdateResponse: triggering resubscription", 1),
+                    # In this case there are no notification while paths are
+                    # pending/in-progress:
+                    ("Potential data loss set for traitDataHandle", 0)]
             else:
                 # Can't inject a bad version in a scenarion without conditional updates
                 return False
@@ -364,124 +383,96 @@ def configure_test(self, scenario, conditionality):
             fault_config = "Weave_WDMUpdateRequestBadProfile_s0_f1:Weave_WDMUpdateResponseBusy_s1_f1"
             # Weave holds on to the metadata of the busy one and retries the update.
             client_log_check = [
-                    # Status report "Internal error"
-                    ("Received StatusReport.*Common.*Internal error", 1),
-                    # The paths fail and the application is notified:
-                    ("Update: path failed: Weave Error 4044: Status Report received from peer, .*Internal error", 1),
-                    ("Update: path failed: Weave Error 4044: Status Report received from peer, .*Sender busy", 1),
-                    # The update that failed with BUSY is tried again and it succeeds
-                    ('Update: path result: success', 1),
-                    # There are no notification while paths are pending/in-progress:
-                    ("Potential data loss set for traitDataHandle", 0)
-                    ]
+                # Status report "Internal error"
+                ("Received StatusReport.*Common.*Internal error", 1),
+                # The paths fail and the application is notified:
+                ("Update: path failed: Weave Error 4044: Status Report received from peer, .*Internal error", 1),
+                ("Update: path failed: Weave Error 4044: Status Report received from peer, .*Sender busy", 1),
+                # The update that failed with BUSY is tried again and it succeeds
+                ('Update: path result: success', 1),
+                # There are no notification while paths are pending/in-progress:
+                ("Potential data loss set for traitDataHandle", 0)
+            ]
 
         if scenario == "UpdateRequestBadProfile":
             fault_config = "Weave_WDMUpdateRequestBadProfile_s0_f1"
             # This fault makes the service reply with an InternalError status.
             # Internal Error means the update should not be retried, and so there is no success.
             client_log_check = [
-                    # Status report "Internal error"
-                    ("Received StatusReport.*Common.*Internal error", 1),
-                    # The paths fail and the application is notified:
-                    ("Update: path failed: Weave Error 4044: Status Report received from peer, .*Internal error", 2),
-                    # The update is not tried again because Internal Error is fatal
-                    ('Update: path result: success', 0),
-                    # There are no notification while paths are pending/in-progress:
-                    ("Potential data loss set for traitDataHandle", 0)
-                    ]
+                # Status report "Internal error"
+                ("Received StatusReport.*Common.*Internal error", 1),
+                # The paths fail and the application is notified:
+                ("Update: path failed: Weave Error 4044: Status Report received from peer, .*Internal error", 2),
+                # The update is not tried again because Internal Error is fatal
+                ('Update: path result: success', 0),
+                # There are no notification while paths are pending/in-progress:
+                ("Potential data loss set for traitDataHandle", 0)
+            ]
 
         if scenario == "UpdateRequestBadProfileBeforeSub":
             fault_config = "Weave_WDMUpdateRequestBadProfile_s0_f1"
             # This fault makes the service reply with an InternalError status.
             # Internal Error means the update should not be retried, and so there is no success.
-            wdm_next_args['client_update_timing'] = "BeforeSub"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_TIMING] = "BeforeSub"
             if conditionality == "Unconditional":
                 client_log_check = [
-                        ("Received StatusReport.*Common.*Internal error", 1),
-                        ('Update: path result: success', 0),
-                        ]
+                    ("Received StatusReport.*Common.*Internal error", 1),
+                    ('Update: path result: success', 0),
+                ]
             else:
                 return False
 
         if scenario == "UpdateRequestMutateDictAndFailSendBeforeSub":
             fault_config = "Weave_WDMUpdateRequestDropMessage_s0_f2"
 
-            wdm_next_args['client_update_mutation'] = "WholeDictionary"
-            wdm_next_args['client_update_num_traits'] = 1
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_MUTATION] = "WholeDictionary"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_NUM_TRAITS] = 1
 
             # This fault makes the service reply with an InternalError status.
             # Internal Error means the update should not be retried, and so there is no success.
-            wdm_next_args['client_update_timing'] = "BeforeSub"
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_TIMING] = "BeforeSub"
             if conditionality == "Unconditional":
                 client_log_check = [
-                        ('Update: path result: success', 1),
-                        ("Potential data loss set for traitDataHandle", 1),
-                        ]
+                    ('Update: path result: success', 1),
+                    ("Potential data loss set for traitDataHandle", 1),
+                ]
             else:
                 return False
 
         if scenario == "FailBindingBeforeSub":
             fault_config = "Weave_CASEKeyConfirm_s0_f2"
-            wdm_next_args['client_update_timing'] = "BeforeSub"
+            dm_next_args[wwno.CLIENT][wwno.UPDATE_TIMING] = "BeforeSub"
             if conditionality == "Unconditional":
                 client_log_check = [
-                        ('Update: path result: success', 2),
-                        ]
+                    ('Update: path result: success', 2),
+                ]
             else:
                 return False
 
-        wdm_next_args['test_tag'] = self.base_test_tag + "_" + str(self.num_tests) + "_" + scenario + "_" + conditionality + "_" + fault_config
-        print wdm_next_args['test_tag']
-        wdm_next_args['client_faults'] = fault_config
-        wdm_next_args['client_update_conditionality'] = conditionality
+        wdm_next_args[wwno.TEST][wwno.TEST_TAG] = self.base_test_tag + "_" + \
+            str(self.num_tests) + "_" + scenario + "_" + conditionality + "_" + fault_config
+        print wdm_next_args[wwno.TEST][wwno.TEST_TAG]
+        wdm_next_args[wwno.CLIENT][wwno.FAULTS] = fault_config
+        wdm_next_args[wwno.CLIENT][wwno.UPDATE_CONDITIONALITY] = conditionality
 
         # In all cases, at the end the application should be notified that there are
         # no more pending updates.
         client_log_check.append(('Update: no more pending updates', 1))
 
-        wdm_next_args['client_log_check'] = client_log_check
+        wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK] = client_log_check
 
         return True
 
     def get_default_options(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 4000
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTraits
-        wdm_next_args['total_client_count'] = 1
-
-        wdm_next_args['enable_retry'] = True
-
-        wdm_next_args['client_update_mutation'] = "OneLeaf"
-        wdm_next_args['client_update_conditionality'] = gOpts["conditionality"]
-        wdm_next_args['client_update_num_traits'] = 2
-        wdm_next_args['client_update_num_mutations'] = 1
-
-        wdm_next_args['test_case_name'] = ['WDM Update sequence for fault-injection']
-
-        self.base_test_tag = 'test_weave_wdm_next_service_update_faults'
-        wdm_next_args['test_tag'] = self.base_test_tag
-
-        wdm_next_args['client_faults'] = None
-        wdm_next_args['server_faults'] = None
-
-
-        return wdm_next_args
+        return self.get_test_param_json(self.__class__.__name__)
 
     def test_weave_wdm_next_service_update_faults(self):
 
         self.happy_path_log_check = [('Mutual: Good Iteration', 1),
-                ('Update: path result: success', 2),
-                ('Update: no more pending updates', 1),
-                ('Update: path failed', 0),
-                ('Need to resubscribe', 0)]
-
+                                     ('Update: path result: success', 2),
+                                     ('Update: no more pending updates', 1),
+                                     ('Update: path failed', 0),
+                                     ('Need to resubscribe', 0)]
 
         if not (gOpts["conditionality"] or gOpts["scenario"]):
 
@@ -495,21 +486,22 @@ def test_weave_wdm_next_service_update_faults(self):
 
             wdm_next_args = self.wdm_next_args
 
-            wdm_next_args['client_log_check'] = self.happy_path_log_check
-            wdm_next_args['client_update_mutation'] = "WholeDictionary"
+            wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK] = self.happy_path_log_check
+            wdm_next_args[wwno.CLIENT][wwno.UPDATE_MUTATION] = "WholeDictionary"
 
             node = 'client'
 
             print 'test file: ' + self.__class__.__name__
             print "weave-wdm-next test update with faults"
-            super(test_weave_wdm_next_service_update_faults, self).weave_wdm_next_test_service_base(wdm_next_args)
+            super(test_weave_wdm_next_service_update_faults,
+                  self).weave_wdm_next_test_service_base(wdm_next_args)
 
         self.num_tests = 0
 
         fault_configs = []
 
-        scenarios = [ gOpts["scenario"] ]
-        conditionalities = [ gOpts["conditionality"] ]
+        scenarios = [gOpts["scenario"]]
+        conditionalities = [gOpts["conditionality"]]
         if (conditionalities[0] == None):
             conditionalities = gConditionalities
 
@@ -534,12 +526,14 @@ def test_weave_wdm_next_service_update_faults(self):
 
             print "Testing: " + scenario + " " + conditionality
 
-            self.assertTrue(len(self.wdm_next_args["client_log_check"]) > 0, "will not run a test without log checks")
+            self.assertTrue(len(self.wdm_next_args[wwno.CLIENT][
+                            wwno.LOG_CHECK]) > 0, "will not run a test without log checks")
 
             result = "Success"
 
             try:
-                super(test_weave_wdm_next_service_update_faults, self).weave_wdm_next_test_service_base(wdm_next_args)
+                super(test_weave_wdm_next_service_update_faults,
+                      self).weave_wdm_next_test_service_base(wdm_next_args)
             except:
                 result = "Failure"
                 num_failures = num_failures + 1
@@ -553,7 +547,6 @@ def test_weave_wdm_next_service_update_faults(self):
             print "\n".join(results)
 
 
-
 if __name__ == "__main__":
 
     help_str = """usage:
@@ -587,6 +580,5 @@ def test_weave_wdm_next_service_update_faults(self):
                 sys.exit(0)
             gOpts["scenario"] = a
 
-
     sys.argv = [sys.argv[0]]
     WeaveUtilities.run_unittest()
diff --git a/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py b/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py
index 119e66f368..b9459ce4cc 100755
--- a/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py
+++ b/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py
@@ -23,19 +23,25 @@
 #       Calls Weave WDM between mock client and NestService Wdm Services via Tunnel
 #
 
+import json
 import os
 import re
+import set_test_path
 import sys
+import time
 import unittest
-import set_test_path
+
 
 from happy.Utils import *
+from topologies.dynamic.thread_wifi_ap_internet_configurable_topology \
+    import thread_wifi_ap_internet_configurable_topology
+import plugins.testrail.TestrailResultOutput
+import Weave
 import WeaveTunnelStart
 import WeaveTunnelStop
 import WeaveWdmNext
-import Weave
-import plugins.testrail.TestrailResultOutput
-from topologies.dynamic.thread_wifi_ap_internet_configurable_topology import thread_wifi_ap_internet_configurable_topology
+import WeaveWdmNextOptions as wwno
+
 
 TEST_OPTION_QUIET = True
 DEFAULT_FABRIC_SEED = "00001"
@@ -44,11 +50,13 @@
 
 
 class weave_wdm_next_test_service_base(unittest.TestCase):
+
     def setUp(self):
-        self.tap = None
-        self.tap_id = None
+        """
+        Set up the toplogy/tunnel and load default test parameters.
+        """
         self.quiet = TEST_OPTION_QUIET
-        self.options = None
+        self.options = WeaveWdmNext.option()
 
         self.topology_setup_required = int(os.environ.get("TOPOLOGY", "1")) == 1
 
@@ -56,42 +64,51 @@ def setUp(self):
 
         self.success_threshold = float(os.environ.get("SUCCESS_THRESHOLD", 0.9))
 
-        self.wdm_client_liveness_check_period = int(os.environ.get("WDM_CLIENT_LIVENESS_CHECK_PERIOD", 30))
-
         fabric_seed = os.environ.get("FABRIC_SEED", DEFAULT_FABRIC_SEED)
 
         if "FABRIC_OFFSET" in os.environ.keys():
-            self.fabric_id = format(int(fabric_seed, 16) + int(os.environ["FABRIC_OFFSET"]), 'x').zfill(5)
+            self.fabric_id = format(int(fabric_seed, 16) +
+                                    int(os.environ["FABRIC_OFFSET"]), 'x').zfill(5)
         else:
             self.fabric_id = fabric_seed
 
         self.eui64_prefix = os.environ.get("EUI64_PREFIX", '18:B4:30:AA:00:')
 
-        self.customized_eui64_seed = self.eui64_prefix + self.fabric_id[0:2] + ':' + self.fabric_id[2:4] + ':' + self.fabric_id[4:]
+        self.customized_eui64_seed = self.eui64_prefix + \
+            self.fabric_id[0:2] + ':' + self.fabric_id[2:4] + ':' + self.fabric_id[4:]
+
+        self.use_service_dir = int(os.environ.get("USE_SERVICE_DIR", "0")) == 1
 
-        self.total_client_count = int(os.environ.get("TOTAL_CLIENT_COUNT", 4))
+        self.enable_random_fabric = int(os.environ.get("ENABLE_RANDOM_FABRIC", "0")) == 1
 
-        self.test_client_delay = int(os.environ.get("TEST_CLIENT_DELAY", 30000))
+        # Set default parameter options
+        self.options[wwno.CLIENT][wwno.TOTAL_COUNT] = int(os.environ.get("TOTAL_CLIENT_COUNT", 4))
 
-        self.timer_client_period = int(os.environ.get("TIMER_CLIENT_PERIOD", 15000))
+        self.options[wwno.CLIENT][wwno.TEST_DELAY] = int(
+            os.environ.get("TEST_CLIENT_DELAY", 30000))
 
-        self.test_timeout = int(os.environ.get("TEST_TIMEOUT", 60 * 30))
+        self.options[wwno.CLIENT][wwno.TIMER_PERIOD] = int(
+            os.environ.get("TIMER_CLIENT_PERIOD", 15000))
 
-        self.case = int(os.environ.get("CASE", "0")) == 1
+        self.options[wwno.TEST][wwno.TIMEOUT] = int(os.environ.get("TEST_TIMEOUT", 60 * 30))
 
-        self.use_service_dir = int(os.environ.get("USE_SERVICE_DIR", "0")) == 1
+        self.options[wwno.CLIENT][wwno.CASE] = int(os.environ.get("CASE", "0")) == 1
 
-        self.enable_random_fabric = int(os.environ.get("ENABLE_RANDOM_FABRIC", "0")) == 1
+        self.options[wwno.CLIENT][wwno.LIVENESS_CHECK_PERIOD] = int(
+            os.environ.get("WDM_CLIENT_LIVENESS_CHECK_PERIOD", 30))
 
         # TODO: Once LwIP bugs for tunnel are fix, enable this test on LwIP
-        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ["WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
+        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ[
+                "WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
             self.tap = True
-            self.tap_id = "wpan0"
+            self.options[wwno.CLIENT][wwno.TAP] = "wpan0"
+            self.options[wwno.SERVER][wwno.TAP] = "wpan0"
             return
         else:
             self.tap = False
 
         if self.topology_setup_required:
+            print "SETTING UP TOPLOGY INTERNET!!!!"
             self.topology = thread_wifi_ap_internet_configurable_topology(quiet=self.quiet,
                                                                           fabric_id=self.fabric_id,
                                                                           customized_eui64_seed=self.customized_eui64_seed,
@@ -103,8 +120,6 @@ def setUp(self):
         else:
             print "topology set up not required"
 
-        self.show_strace = False
-
         self.weave_wdm = None
         # Wait for a second to ensure that Weave ULA addresses passed dad
         # and are no longer tentative
@@ -116,118 +131,142 @@ def setUp(self):
         # Start tunnel
         value, data = self.__start_tunnel_from("BorderRouter")
 
-        import time
         try:
             print "sleeping..."
-            #time.sleep(60*60)
+            # time.sleep(60*60)
         except:
             print "sleep interrupted"
 
-
-
-
     def tearDown(self):
-
-        # Stop tunnel
+        """
+        Tear down the tunnel/toplogy.
+        """
         value, data = self.__stop_tunnel_from("BorderRouter")
         if self.topology_setup_required:
             self.topology.destroyTopology()
             self.topology = None
 
+    @staticmethod
+    def get_test_param_json(test_name):
+        """
+        Retrieve the test params for a particular test.
+
+        Args:
+            test_name (str): Name of the test.
+
+        Returns:
+            dict: Dictionary containing test, client, and server test params.
+        """
+        curr_file_dir = os.path.dirname(os.path.abspath(__file__))
+        test_param_json_path = "{}/weave_wdm_next_test_service_params.json".format(curr_file_dir)
+        with open(test_param_json_path) as json_file:
+            data = json.load(json_file)
+            return data[test_name]
 
     def weave_wdm_next_test_service_base(self, wdm_next_args):
-        default_options = {'test_client_case' : 1,
-                           'save_client_perf' : False,
-                           'total_client_count': self.total_client_count,
-                           'timer_client_period': self.timer_client_period,
-                           'enable_client_stop' : True,
-                           'timeout' : self.test_timeout,
-                           'test_client_delay' : self.test_client_delay,
-                           'client_event_generator' : None,
-                           'client_inter_event_period' : None,
-                           'client_faults' : None,
-                           'server_faults' : None,
-                           'test_case_name' : [],
-                           'enable_client_dictionary_test' : False,
-                           'wdm_client_liveness_check_period': self.wdm_client_liveness_check_period,
-                           'enable_mock_event_timestamp_initial_counter': True
-                           }
-
-        default_options.update(wdm_next_args)
-        self.__dict__.update(default_options)
-        self.default_options = default_options
-
-        value, data = self.__run_wdm_test_between("ThreadNode", "service")
-        self.__process_result("ThreadNode", "service", value, data)
+        """
+        Initiate wdm next test between client and service given test parameters.
+
+        Args:
+            wdm_next_args (dict): Test parameters.
+        """
+        success, data = self.__run_wdm_test_between("ThreadNode", "service", wdm_next_args)
+        self.__process_result("ThreadNode", "service", success, data)
         self.result_data = data
 
         delayExecution(1)
 
-
     def __start_tunnel_from(self, gateway):
+        """
+        Start the weave tunnel.
+
+        Args:
+            gateway (str): Node to start tunnel from.
+
+        Returns:
+            (bool, list): Whether weave tunnel started successfully and logs
+        """
         options = WeaveTunnelStart.option()
         options["quiet"] = TEST_OPTION_QUIET
         options["border_gateway"] = gateway
-        options["tap"] = self.tap_id
-
-        options["case"] = self.case
-
+        options["tap"] = self.options[wwno.CLIENT][wwno.TAP]
+        options["case"] = self.options[wwno.CLIENT][wwno.CASE]
         options["service_dir"] = self.use_service_dir
 
         weave_tunnel = WeaveTunnelStart.WeaveTunnelStart(options)
         ret = weave_tunnel.run()
-
         value = ret.Value()
         data = ret.Data()
 
         return value, data
 
+    def __run_wdm_test_between(self, nodeA, nodeB, wdm_next_args):
+        """
+        Execute the test between two nodes given test parameters.
 
-    def __run_wdm_test_between(self, nodeA, nodeB):
-        options = WeaveWdmNext.option()
+        Args:
+            nodeA (str): First node identifier.
+            nodeB (str): Second node identifier.
+            wdm_next_args (dict): Custom test parameters.
 
-        options.update(self.default_options)
-        options["clients"] = [nodeA + str(index + 1).zfill(2) for index in range(self.device_numbers)]
-        options["server"] = nodeB
-        options["tap"] = self.tap
-        options["test_tag"] = options["test_tag"][19:].upper()
-        options["device_numbers"] = self.device_numbers
-        options["quiet"] = TEST_OPTION_QUIET
-        options["case"] = self.case
-        self.options = options
-        self.weave_wdm = WeaveWdmNext.WeaveWdmNext(options)
+        Returns:
+            (bool, list): Whether test executed without parser/leak errors and
+                          test results/logs
+        """
+        # Update default options with test parameters
+        for category, test_param_args in wdm_next_args.items():
+            self.options[category].update(test_param_args)
 
-        ret = self.weave_wdm.run()
+        self.options[wwno.TEST][wwno.CLIENT] = [nodeA + str(index + 1).zfill(2)
+                                                for index in range(self.device_numbers)]
+        self.options[wwno.TEST][wwno.SERVER] = nodeB
+        self.options[wwno.CLIENT][wwno.ENABLE_DICTIONARY_TEST] = False
 
-        value = ret.Value()
+        self.weave_wdm = WeaveWdmNext.WeaveWdmNext(self.options)
+
+        ret = self.weave_wdm.run_client_test()
+        success = ret.Value()
         data = ret.Data()
 
-        return value, data
+        return success, data
 
+    def __process_result(self, nodeA, nodeB, success, all_data):
+        """
+        Process the weave wdm next test results.
 
-    def __process_result(self, nodeA, nodeB, value, all_data):
+        Args:
+            nodeA (str): First node identifier.
+            nodeB (str): Second node identifier.
+            success (bool): Whether test executed successfully without parser/leak errors.
+            all_data (list): Results from weave wdm test including node logs.
+        """
         success = True
         client_event_dic = None
         client_stress_event_dic = None
+        tc_name = self.options[wwno.TEST][wwno.TEST_CASE_NAME]
 
         exception_dic = {}
         for data in all_data:
             test_results = []
             wdm_sanity_check = True
-            wdm_stress_check = value
+            wdm_stress_check = success
             wdm_sanity_diag_list = []
             wdm_stress_diag_list = []
-            wdm_sanity_diag_list.append('test_file: %s\n client_weave_id: %s\n parameters: %s\n'
-                                        % (self.test_tag, data['client_weave_id'], str(self.options)))
-            wdm_stress_diag_list.append('test_file: %s\n client_weave_id: %s\n parameters: %s\n'
-                                        % (self.test_tag, data['client_weave_id'], str(self.options)))
+            wdm_sanity_diag_list.append('test_file: {}\n client_weave_id: {}\n parameters: {}\n'
+                                        .format(self.options[wwno.TEST][wwno.TEST_TAG],
+                                                data['client_weave_id'], self.options))
+            wdm_stress_diag_list.append('test_file: {}\n client_weave_id: {}\n parameters: {}\n'
+                                        .format(self.options[wwno.TEST][wwno.TEST_TAG],
+                                                data['client_weave_id'], self.options))
             wdm_stress_diag_list.append(str(data['success_dic']))
-            print "weave-wdm-next %s from " % self.wdm_option + data['client'] + " to " + nodeB + " "
-            if len(self.test_case_name) == 2:
+            print "weave-wdm-next {} from {} to {}".format(
+                self.options[wwno.TEST][wwno.WDM_OPTION], data['client'], nodeB)
+            if len(tc_name) == 2:
                 client_delimiter = 'Current completed test iteration is'
-                client_completed_iter_list = [i + client_delimiter for i in data["client_output"].split(client_delimiter)]
+                client_completed_iter_list = [
+                    i + client_delimiter for i in data["client_output"].split(client_delimiter)]
 
-                for i in self.client_log_check:
+                for i in self.options[wwno.CLIENT][wwno.LOG_CHECK]:
                     item_output_cnt = len(re.findall(i[0], client_completed_iter_list[0]))
                     if item_output_cnt == 0 and i[1] != 0:
                         wdm_sanity_check = False
@@ -240,64 +279,75 @@ def __process_result(self, nodeA, nodeB, value, all_data):
                     wdm_sanity_check = False
                     wdm_sanity_diag_list.append("missing good iteration")
 
-                if self.client_event_generator is not None:
-                    client_event_dic = self.weave_wdm.wdm_next_client_event_sequence_process(client_completed_iter_list[0])
-                    if not ((client_event_dic['success'] is True)):
+                if self.options[wwno.CLIENT][wwno.EVENT_GENERATOR]:
+                    client_event_dic = self.weave_wdm.wdm_next_client_event_sequence_process(
+                        client_completed_iter_list[0])
+                    if not client_event_dic['success']:
                         wdm_sanity_check = False
                         wdm_sanity_diag_list.append("initiator missing events:")
                     else:
                         wdm_sanity_diag_list.append("initiator good events:")
                     wdm_sanity_diag_list.append(str(client_event_dic))
 
-                client_sanity_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(client_completed_iter_list[0])
+                client_sanity_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(
+                    client_completed_iter_list[0])
                 wdm_sanity_diag_list.append("initiator sanity trait checksum:")
                 wdm_sanity_diag_list.append(str(client_sanity_checksum_list))
 
             success_iterations_count = len(re.findall("Good Iteration", data["client_output"]))
-            success_rate = success_iterations_count/float(self.test_client_iterations)
-            success_iterations_rate_string = "success rate(success iterations/total iterations) %d/%d = %0.3f" \
-                                             % (success_iterations_count, self.test_client_iterations, success_rate)
+            success_rate = round(success_iterations_count /
+                                 float(self.options[wwno.CLIENT][wwno.TEST_ITERATIONS]), 3)
+            success_iterations_rate_string = "success rate(success iterations/total iterations) "\
+                                             "{}/{} = {}".format(
+                                                 success_iterations_count,
+                                                 self.options[wwno.CLIENT][wwno.TEST_ITERATIONS],
+                                                 success_rate)
+
             wdm_stress_diag_list.append(success_iterations_rate_string)
 
-            for i in self.client_log_check:
+            for i in self.options[wwno.CLIENT][wwno.LOG_CHECK]:
                 item_output_cnt = len(re.findall(i[0], data["client_output"]))
                 if item_output_cnt != i[1]:
                     wdm_stress_check = False
-                    wdm_stress_diag_list.append("wrong number of '%s' in client_output, expected %d, actual %d" % (i[0], i[1], item_output_cnt))
-
-            if self.client_event_generator is not None:
-                client_stress_event_dic = self.weave_wdm.wdm_next_client_event_sequence_process(data["client_output"])
-                if not ((client_stress_event_dic['success']) is True):
+                    wdm_stress_diag_list.append(
+                        "wrong number of '%s' in client_output, expected %d, actual %d" %
+                        (i[0], i[1], item_output_cnt))
+
+            if self.options[wwno.CLIENT][wwno.EVENT_GENERATOR]:
+                client_stress_event_dic = self.weave_wdm.wdm_next_client_event_sequence_process(data[
+                                                                                                "client_output"])
+                if not client_stress_event_dic['success']:
                     wdm_stress_check = False
                     wdm_stress_diag_list.append("missing events:")
                 else:
                     wdm_stress_diag_list.append("good events:")
                 wdm_stress_diag_list.append(str(client_stress_event_dic))
 
-            client_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(data["client_output"])
+            client_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(
+                data["client_output"])
             wdm_stress_diag_list.append("initiator trait checksum:")
             wdm_stress_diag_list.append(str(client_checksum_list))
 
-            if len(self.test_case_name) == 2:
+            if len(tc_name) == 2:
                 test_results.append({
-                    'testName': self.test_case_name[0],
+                    'testName': tc_name[0],
                     'testStatus': 'success' if wdm_sanity_check else 'failure',
                     'testDescription': ('Sanity test passed!' if wdm_sanity_check else 'Sanity test failed!')
-                                       + "\n" + ''.join(wdm_sanity_diag_list),
+                    + "\n" + ''.join(wdm_sanity_diag_list),
                     'success_iterations_count': (1 if wdm_sanity_check else 0),
                     'initiator_event_list': str(client_event_dic['client_event_list']) if client_event_dic else [],
                     'initiator_trait_checksum_list': str(client_sanity_checksum_list) if client_sanity_checksum_list else [],
                     'total_iterations_count': 1
                 })
             test_results.append({
-                'testName': self.test_case_name[1] if len(self.test_case_name) == 2 else self.test_case_name[0],
+                'testName': tc_name[1] if len(tc_name) == 2 else tc_name[0],
                 'testStatus': 'success' if wdm_stress_check else 'failure',
-                'testDescription': ('Stress test passed!' if wdm_stress_check else 'Stress test failed!')
-                                   + "\n" + ''.join(wdm_stress_diag_list),
+                'testDescription': ('Stress test passed!\n' if wdm_stress_check
+                                    else 'Stress test failed!\n') + ''.join(wdm_stress_diag_list),
                 'success_iterations_count': success_iterations_count,
                 'initiator_event_list': str(client_stress_event_dic['client_event_list']) if client_stress_event_dic else [],
                 'initiator_trait_checksum_list': str(client_checksum_list) if client_checksum_list else [],
-                'total_iterations_count': self.test_client_iterations
+                'total_iterations_count': self.options[wwno.CLIENT][wwno.TEST_ITERATIONS]
             })
 
             # output the test result to a json file
@@ -306,8 +356,8 @@ def __process_result(self, nodeA, nodeB, value, all_data):
                 'testResults': test_results
             }
 
-            output_file_name = self.weave_wdm.process_log_prefix + data['client'] + self.test_tag[20:].upper() \
-                                    + TESTRAIL_SUFFIX
+            output_file_name = self.weave_wdm.process_log_prefix + data['client'] + \
+                self.options[wwno.TEST][wwno.TEST_TAG][1:].upper() + TESTRAIL_SUFFIX
 
             self.__output_test_result(output_file_name, output_data)
 
@@ -316,10 +366,15 @@ def __process_result(self, nodeA, nodeB, value, all_data):
             if not wdm_stress_check:
                 print "wdm_stress_check is False\n\n" + "\n\t".join(wdm_stress_diag_list)
 
-
             try:
-                self.assertTrue(wdm_sanity_check, "wdm_sanity_check %s == True %%" % (str(wdm_sanity_check))) 
-                self.assertTrue(wdm_stress_check, "wdm_stress_check %s == True %%" % (str(wdm_stress_check))) 
+                self.assertTrue(
+                    wdm_sanity_check,
+                    "wdm_sanity_check %s == True %%" %
+                    (str(wdm_sanity_check)))
+                self.assertTrue(
+                    wdm_stress_check,
+                    "wdm_stress_check %s == True %%" %
+                    (str(wdm_stress_check)))
             except AssertionError:
                 success = False
                 exception_dic[data['client']] = test_results
@@ -333,6 +388,13 @@ def __process_result(self, nodeA, nodeB, value, all_data):
             print hgreen("Passed")
 
     def __output_test_result(self, file_path, output_data):
+        """
+        Output the test results in Testrail.
+
+        Args:
+            file_path (str): Path to testrail logs.
+            output_data (dict): Holds the test results.
+        """
         options = plugins.testrail.TestrailResultOutput.option()
         options["quiet"] = TEST_OPTION_QUIET
         options["file_path"] = file_path
@@ -341,17 +403,23 @@ def __output_test_result(self, file_path, output_data):
         output_test = plugins.testrail.TestrailResultOutput.TestrailResultOutput(options)
         output_test.run()
 
-
     def __stop_tunnel_from(self, gateway):
+        """
+        Stop the weave tunnel.
+
+        Args:
+            gateway (str): Node to start tunnel from.
+
+        Returns:
+            (bool, list): Whether weave tunnel started successfully and logs
+        """
         options = WeaveTunnelStop.option()
         options["quiet"] = TEST_OPTION_QUIET
         options["border_gateway"] = gateway
-
         options["service_dir"] = self.use_service_dir
 
         weave_tunnel = WeaveTunnelStop.WeaveTunnelStop(options)
         ret = weave_tunnel.run()
-
         value = ret.Value()
         data = ret.Data()
 
@@ -360,5 +428,3 @@ def __stop_tunnel_from(self, gateway):
 
 if __name__ == "__main__":
     unittest.main()
-
-
diff --git a/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_params.json b/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_params.json
new file mode 100644
index 0000000000..3d4cf3dabb
--- /dev/null
+++ b/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_params.json
@@ -0,0 +1,1707 @@
+{
+    "test_weave_wdm_next_service_mutual_subscribe_01": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-E01: Mutual Subscribe: Root path. Null Version. Client in initiator cancels", 
+                "'Wdm-NestService-M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_01", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_02": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-E02: Mutual Subscribe: Root path, Null Version, Publisher in initiator Cancel", 
+                "'Wdm-NestService-M02: Stress Mutual Subscribe: Root path, Null Version, Publisher in initiator Cancel'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_02", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_03": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-E03: Mutual Subscribe: Root path. Null Version. Client in initiator aborts", 
+                "'Wdm-NestService-M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_03", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_04": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-E04: Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts", 
+                "'Wdm-NestService-M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_04", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_05": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F01: Mutual Subscribe: Root path, Null Version, Idle, Client in initiator Cancel", 
+                "'Wdm-NestService-M05: Stress Mutual Subscribe: Root path, Null Version, Idle, Client in initiator Cancel'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_05", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_06": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F02: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels", 
+                "'Wdm-NestService-M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_06", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_07": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F03: Mutual Subscribe: Root path. Null Version. Idle. Client in initiator aborts", 
+                "'Wdm-NestService-M07: Stress Mutual Subscribe: Root path. Null Version. Idle. Client in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_07", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_08": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F04: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts", 
+                "'Wdm-NestService-M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_08", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_09": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F05: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels", 
+                "'Wdm-NestService-M09: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_09", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_10": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F06: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator cancels", 
+                "'Wdm-NestService-M10: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_10", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_11": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F07: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator aborts", 
+                "'Wdm-NestService-M11: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_11", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_12": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-F08: Mutual Susbscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator aborts", 
+                "'Wdm-NestService-M12: Stress Mutual Susbscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_12", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_13": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 120
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-M21: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Client in initiator cancels"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_13", 
+            "timeout": 900, 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_14": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 120
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-M22: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Publisher in initiator cancels"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_14", 
+            "timeout": 900, 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_15": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 120
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-M23: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Client in initiator abort"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_15", 
+            "timeout": 900, 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_16": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 120
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-M24: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator for X times and Y minutes. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_16", 
+            "timeout": 900, 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_17": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 0, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I01: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels", 
+                "'Wdm-NestService-M25: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_17", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_18": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I02: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator cancels", 
+                "'Wdm-NestService-M26: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_18", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_19": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I03: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator aborts", 
+                "'Wdm-NestService-M27: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_19", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_20": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I04: Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator aborts", 
+                "'Wdm-NestService-M28: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_20", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_21": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-G02: Mutual Subscribe: Multiple Iterations. Mutate data in Initiator. Client in initiator aborts. Version is kept."
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_21", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_22": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 0, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I09: Mutual Subscribe: Root path. Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels", 
+                "'Wdm-NestService-M33: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Client in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_22", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_23": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I10: Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator cancels", 
+                "'Wdm-NestService-M34: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator cancels'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_23", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_24": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I11: Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator aborts", 
+                "'Wdm-NestService-M35: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Publisher in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_24", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_25": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-I12: Mutual Subscribe: Root path. Initiator Continuous Events. Client in initiator aborts", 
+                "'Wdm-NestService-M36: Stress Mutual Subscribe: Root path. Initiator Continuous Events. Client in initiator aborts'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_25", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_mutual_subscribe_application_key_01": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] \\[.+\\] EndSubscription Ref\\(\\d+\\)", 
+                    10
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    10
+                ]
+            ], 
+            "test_case": 2, 
+            "test_iterations": 10
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-A01: Mutual Subscribe: Application key: Key distribution", 
+                "'Wdm-NestService-B01: B01: Stress Mutual Subscribe: Application key: Key distribution'"
+            ], 
+            "test_tag": "_SERVICE_MUTUAL_SUBSCRIBE_APPLICATION_KEY_01", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_01_cond_OneLeaf": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    1
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "unconditional update", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O01: Client creates a mutual subscription, sends one UpdateRequest to the publisher, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_01_COND_ONELEAF", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_02_cond_BackToBack": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    2
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 2, 
+            "wdm_update_number_of_repeated_mutations": 2, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O02: Client creates a mutual subscription, sends two conditional UpdateRequests to the publisher back-to-back"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_02_COND_BACKTOBACK", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_03_uncond_OneLeaf": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    1
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Unconditional", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O03: Client creates mutual subscription, sends an unconditional UpdateRequest to publisher, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_03_UNCOND_ONELEAF", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_04_uncond_BackToBack": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    2
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Unconditional", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 2, 
+            "wdm_update_number_of_repeated_mutations": 2, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O02: Client creates a mutual subscription, sends two unconditional UpdateRequests to the publisher back-to-back"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_04_UNCOND_BACKTOBACK", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_05_cond_WholeDictionary": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    1
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "replace dictionary", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "WholeDictionary", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O05: Client creates a mutual subscription, sends one UpdateRequest to the publisher to replace a whole dictionary, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_05_COND_WHOLEDICTIONARY", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_06_cond_WholeLargeDictionary": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    2
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "WholeLargeDictionary", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O06: Client creates a mutual subscription, sends one UpdateRequest to the publisher to replace a whole dictionary, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_06_COND_WHOLELARGEDICTIONARY", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_07_cond_OneLeaf_multi_traits": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    2
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 2
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O07: Client creates a mutual subscription, sends one UpdateRequest to the publisher with 2 traits, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_07_COND_ONELEAF_MULTI_TRAITS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_08_mixed_OneLeaf_multi_traits": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    2
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Mixed", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 2
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O08: Client creates a mutual subscription, sends one UpdateRequest to the publisher with 2 traits, one conditional and one not, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_08_MIXED_ONELEAF_MULTI_TRAITS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_09_mixed_SameLevelLeafs_multi_traits": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    4
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Mixed", 
+            "wdm_update_mutation": "SameLevelLeaves", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 2
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O09: Client creates a mutual subscription, sends one UpdateRequest to the publisher with multiple leaves in 2 traits, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_09_MIXED_SAMELEVELLEAFS_MULTI_TRAITS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_10_cond_Root_multi_traits": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    4
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "DataElement didn.*; will try again later", 
+                    1
+                ], 
+                [
+                    "Msg sent 0000000B:44", 
+                    1
+                ], 
+                [
+                    "Msg sent 0000000B:34", 
+                    1
+                ], 
+                [
+                    "Removed 2 private InProgress items after 3", 
+                    1
+                ], 
+                [
+                    "Path already present", 
+                    2
+                ], 
+                [
+                    "replace dictionary", 
+                    0
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "Root", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 4
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O10: Client creates a mutual subscription, sends one UpdateRequest to the publisher with 4 full traits, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_10_COND_ROOT_MULTI_TRAITS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_11_uncond_WholeLargeDictionary": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    1
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Unconditional", 
+            "wdm_update_mutation": "WholeLargeDictionary", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 1
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O11: Client creates a mutual subscription, sends one UpdateRequest to the publisher to replace a whole dictionary, and receives a StatusReport"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_11_UNCOND_WHOLELARGEDICTIONARY", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_12_uncond_OneLeaf_BeforeSub": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Potential data loss set for traitDataHandle", 
+                    0
+                ], 
+                [
+                    "Potential data loss cleared for traitDataHandle", 
+                    0
+                ], 
+                [
+                    "Update: path result: success", 
+                    1
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Unconditional", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 1, 
+            "wdm_update_timing": "BeforeSub"
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O03: Client creates mutual subscription, sends an unconditional UpdateRequest to publisher before starting the subscription"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_12_UNCOND_ONELEAF_BEFORESUB", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_13_cond_ManyDictionaryItems": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Mutual: Good Iteration", 
+                    1
+                ], 
+                [
+                    "Update: path result: success", 
+                    122
+                ], 
+                [
+                    "Update: no more pending updates", 
+                    1
+                ], 
+                [
+                    "Update: path failed", 
+                    0
+                ], 
+                [
+                    "Need to resubscribe", 
+                    0
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Conditional", 
+            "wdm_update_mutation": "ManyDictionaryItems", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 4
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "Wdm-NestService-O13: Client creates a mutual subscription, sends a conditional UpdateRequest to publisher with many dictionary items"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_13_COND_MANYDICTIONARYITEMS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_service_update_faults": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "test_case": 10, 
+            "test_delay": 4000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 1, 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_number_of_traits": 2
+        }, 
+        "server_options": {}, 
+        "test_options": {
+            "test_case_name": [
+                "WDM Update sequence for fault-injection"
+            ], 
+            "test_tag": "_SERVICE_UPDATE_FAULTS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }
+}
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_01.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_01.py
index 71e707fc30..aa34ec7f87 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_01.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_01.py
@@ -34,41 +34,9 @@
 class test_weave_wdm_next_application_key_01(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_application_key_01(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['test_client_case'] = 2
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['test_server_case'] = 2
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[35:].upper()
-        wdm_next_args['test_case_name'] = ['B01: Stress Mutual Subscribe: Application key: Key distribution']
         print 'test file: ' + self.__class__.__name__
         print "test_weave_wdm_next_application_key test A01 and B01"
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         super(test_weave_wdm_next_application_key_01, self).weave_wdm_next_test_base(wdm_next_args)
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_02.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_02.py
index 665438aa17..fd2e5f1588 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_02.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_02.py
@@ -28,49 +28,19 @@
 import os
 import unittest
 from weave_wdm_next_test_base import weave_wdm_next_test_base
+import WeaveWdmNextOptions as wwno
 
 
 class test_weave_wdm_next_application_key_02(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_application_key_02(self):
-        wdm_next_args = {}
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['group_enc'] = True
-        wdm_next_args['group_enc_key_id'] = "0x00005536"
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Message Encryption Key', 1),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(1\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(1\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[35:].upper()
-        wdm_next_args['test_case_name'] = ['B02: Stress Mutual Subscribe: Application key: Group key']
         print 'test file: ' + self.__class__.__name__
         print "test_weave_wdm_next_application_key test A02 and B02"
-        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ["WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
+        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ[
+                "WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
             print "it does not support wdm with group key encryption under Lwip:"
             return
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         super(test_weave_wdm_next_application_key_02, self).weave_wdm_next_test_base(wdm_next_args)
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_resub.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_resub.py
index b5f734a157..aef429cb81 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_resub.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_resub.py
@@ -31,7 +31,7 @@
 import unittest
 import set_test_path
 import WeaveUtilities
-
+import WeaveWdmNextOptions as wwno
 
 from weave_wdm_next_test_base import weave_wdm_next_test_base
 
@@ -41,80 +41,57 @@
 class test_weave_wdm_next_mutual_resub(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_resub(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['enable_client_stop'] = True
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_stop'] = False
-        wdm_next_args['test_server_iterations'] = 1
-        wdm_next_args['enable_server_flip'] = 1
-        wdm_next_args['enable_retry'] = True
-
-        base_test_tag = "_MUTUAL_RESUB"
-        wdm_next_args['test_tag'] = base_test_tag
-        wdm_next_args['test_case_name'] = ['N04: Mutual Subscribe: Root path, Null Version, Resubscribe On Error']
-
-        # We're going to run once, but expect a successful subscription since
-        # retries are enabled.
-        NUM_ITERATIONS = 1
-        wdm_next_args['test_client_iterations'] = NUM_ITERATIONS
-        wdm_next_args['server_log_check'] = []
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         fault_list = {}
         fault_list['server'] = [
-                # fail to create the first subscription handler on the
-                # server side. this sends a StatusReport to the client
-                # in the subscribing stage, which triggers another
-                # subscribe request to be sent.
-                ('Weave_WDMSubscriptionHandlerNew_s0_f1', 2),
-
-                # on counter subscription, responder sends an invalid
-                # message type, which triggers a StatusReport from the
-                # initiator. this causes the responder to tear down the
-                # mutual subscription (which is in confirming state),
-                # then a retry is set up.
-                ('Weave_WDMSendUnsupportedReqMsgType_s0_f1', 2),
-
-                # reject the NotificationRequest coming from the initiator,
-                # sending StatusReport to the client after the mutual
-                # subscription is established (initiator will be in the alive
-                # state).
-                ('Weave_WDMBadSubscriptionId_s0_f1', 2),
-                ]
+            # fail to create the first subscription handler on the
+            # server side. this sends a StatusReport to the client
+            # in the subscribing stage, which triggers another
+            # subscribe request to be sent.
+            ('Weave_WDMSubscriptionHandlerNew_s0_f1', 2),
+
+            # on counter subscription, responder sends an invalid
+            # message type, which triggers a StatusReport from the
+            # initiator. this causes the responder to tear down the
+            # mutual subscription (which is in confirming state),
+            # then a retry is set up.
+            ('Weave_WDMSendUnsupportedReqMsgType_s0_f1', 2),
+
+            # reject the NotificationRequest coming from the initiator,
+            # sending StatusReport to the client after the mutual
+            # subscription is established (initiator will be in the alive
+            # state).
+            ('Weave_WDMBadSubscriptionId_s0_f1', 2),
+        ]
         fault_list['client'] = [
-                # fail 3 instances of a send error after allowing the first.
-                # this will cause a failure after the subscription has been
-                # established. fail a few instances to confirm the retries
-                # continue. this tests the OnSendError and OnResponseTimeout
-                # callbacks in WDM.
-                ('Weave_WRMSendError_s1_f3', 4),
-                ]
+            # fail 3 instances of a send error after allowing the first.
+            # this will cause a failure after the subscription has been
+            # established. fail a few instances to confirm the retries
+            # continue. this tests the OnSendError and OnResponseTimeout
+            # callbacks in WDM.
+            ('Weave_WRMSendError_s1_f3', 4),
+        ]
+
+        base_test_tag = wdm_next_args[wwno.TEST][wwno.TEST_TAG]
 
         for node in gFaultopts.nodes:
             for fault_config, expected_retries in fault_list[node]:
-                wdm_next_args['client_log_check'] = [("Good Iteration", NUM_ITERATIONS),
-                                                     ('SendSubscribeRequest', NUM_ITERATIONS * expected_retries)]
-                wdm_next_args['test_tag'] = "%s_%s_FAULT_%s" % (base_test_tag, node.upper(), fault_config)
-                print wdm_next_args['test_tag']
+                wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK] = [
+                    ("Good Iteration", wdm_next_args[wwno.CLIENT][wwno.TEST_ITERATIONS]),
+                    ('SendSubscribeRequest', wdm_next_args[wwno.CLIENT][wwno.TEST_ITERATIONS] * expected_retries)]
+                wdm_next_args[wwno.TEST][wwno.TEST_TAG] = "%s_%s_FAULT_%s" % (
+                    base_test_tag, node.upper(), fault_config)
+                print wdm_next_args[wwno.TEST][wwno.TEST_TAG]
                 if node == 'client':
-                    wdm_next_args['client_faults'] = fault_config
-                    wdm_next_args['server_faults'] = None
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = fault_config
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = None
                 else:
-                    wdm_next_args['client_faults'] = None
-                    wdm_next_args['server_faults'] = fault_config
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = None
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = fault_config
 
-                super(test_weave_wdm_next_mutual_resub, self).weave_wdm_next_test_base(wdm_next_args)
+                super(
+                    test_weave_wdm_next_mutual_resub,
+                    self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_01.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_01.py
index e8417b551c..f23f2919c5 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_01.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_01.py
@@ -34,41 +34,11 @@
 class test_weave_wdm_next_mutual_subscribe_01(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_01(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels'
-        ]
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E01 and M01"
-        super(test_weave_wdm_next_mutual_subscribe_01, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_01,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_02.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_02.py
index e0bea55102..f25db8a295 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_02.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_02.py
@@ -34,41 +34,11 @@
 class test_weave_wdm_next_mutual_subscribe_02(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_02(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['save_client_perf'] = False
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M02: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E02 and M02"
-        super(test_weave_wdm_next_mutual_subscribe_02, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_02,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_03.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_03.py
index 4c87d5944c..2c0c71466c 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_03.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_03.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_03(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_03(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True        
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']), 
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E03 and M03"
-        super(test_weave_wdm_next_mutual_subscribe_03, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_03,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_04.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_04.py
index 5b80e6c4b7..312f60bfc5 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_04.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_04.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_04(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_04(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E04 and M04"
-        super(test_weave_wdm_next_mutual_subscribe_04, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_04,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_05.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_05.py
index c42f8911fa..f45f5b8e1e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_05.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_05.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_05(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_05(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)',wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M05: Stress Mutual Subscribe: Root path. Null Version. Idle, Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F01 and M05"
-        super(test_weave_wdm_next_mutual_subscribe_05, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_05,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_06.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_06.py
index a4d07077ca..98477e8e5c 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_06.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_06.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_06(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_06(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F02 and M06"
-        super(test_weave_wdm_next_mutual_subscribe_06, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_06,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_07.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_07.py
index 4d52271d48..2f58a085de 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_07.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_07.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_07(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_07(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M07: Stress Mutual Susbscribe: Root path. Null Version. Idle. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F03 and M07"
-        super(test_weave_wdm_next_mutual_subscribe_07, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_07,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_08.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_08.py
index f9d974d64a..7076130c57 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_08.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_08.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_08(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_08(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F04 and M08"
-        super(test_weave_wdm_next_mutual_subscribe_08, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_08,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_09.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_09.py
index 1381d4d050..5af7d29916 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_09.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_09.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_09(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_09(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M09: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F05 and M09"
-        super(test_weave_wdm_next_mutual_subscribe_09, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_09,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_10.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_10.py
index d8111c418f..f03190a05a 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_10.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_10.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_10(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_10(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[ALIVE\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M10: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F06 and M10"
-        super(test_weave_wdm_next_mutual_subscribe_10, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_10,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_11.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_11.py
index 08aae0a9c3..341f6f770f 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_11.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_11.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_11(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_11(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M11: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F07 and M11"
-        super(test_weave_wdm_next_mutual_subscribe_11, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_11,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_12.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_12.py
index 332d664e2a..890b53c302 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_12.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_12.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_12(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_12(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M12: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator.Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F08 and M12"
-        super(test_weave_wdm_next_mutual_subscribe_12, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_12,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_13.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_13.py
index fd4efd9f45..fab6989eff 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_13.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_13.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_13(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_13(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M13: Stress Mutual Subscribe: Root path. Null Version. Mutate data in responder. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F09 and M13"
-        super(test_weave_wdm_next_mutual_subscribe_13, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_13,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_14.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_14.py
index 13ba270c18..805f392f2d 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_14.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_14.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_14(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_14(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M14: Stress Mutual Subscribe: Root path, Null Version, Notification in responder, Publisher in initiator Cancel']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F10 and M14"
-        super(test_weave_wdm_next_mutual_subscribe_14, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_14,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_15.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_15.py
index 7066181d28..bb90f2a4ae 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_15.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_15.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_15(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_15(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M15: Stress Mutual Subscribe: Root path. Null Version. Notification in responder. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F11 and M15"
-        super(test_weave_wdm_next_mutual_subscribe_15, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_15,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_16.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_16.py
index 91bc5392ba..f511f99a2f 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_16.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_16.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_16(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_16(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M16: Stress Mutual Subscribe: Root path. Null Version. Mutate data in responder. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F12 and M16"
-        super(test_weave_wdm_next_mutual_subscribe_16, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_16,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_17.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_17.py
index d8fa8ec97e..8e1ba848f2 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_17.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_17.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_17(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_17(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M17: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F13 and M17"
-        super(test_weave_wdm_next_mutual_subscribe_17, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_17,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_18.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_18.py
index e4cc9a85ec..b2dc656c6b 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_18.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_18.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_18(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_18(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M18: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F14 and M18"
-        super(test_weave_wdm_next_mutual_subscribe_18, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_18,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_19.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_19.py
index 79eb75fcee..ea3307c936 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_19.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_19.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_19(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_19(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M19: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F15 and M19"
-        super(test_weave_wdm_next_mutual_subscribe_19, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_19,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_20.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_20.py
index 6bfe0e77c8..47bf6ca62b 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_20.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_20.py
@@ -34,44 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_20(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_20(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M20: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F16 and M20"
-        super(test_weave_wdm_next_mutual_subscribe_20, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_20,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_21.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_21.py
index 0d8424e4aa..cef6894c5d 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_21.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_21.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_21(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_21(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 0
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E05: Mutual Subscribe: Root path. Null Version. Client in responder cancels']
-
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E05"
-        super(test_weave_wdm_next_mutual_subscribe_21, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_21,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_22.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_22.py
index 14aa607e88..f545321a3e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_22.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_22.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_22(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_22(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E06: Mutual Subscribe: Root path. Null Version. Publisher in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E06"
-        super(test_weave_wdm_next_mutual_subscribe_22, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_22,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_23.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_23.py
index 7825b49d32..fac77ca596 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_23.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_23.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_23(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_23(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 2
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E07: Mutual Subscribe: Root path. Null Version. Client in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E07"
-        super(test_weave_wdm_next_mutual_subscribe_23, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_23,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_24.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_24.py
index 0cdd30a561..7b04a56c60 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_24.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_24.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_24(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_24(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E08: Mutual Subscribe: Root path. Null Version. Publisher in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E08"
-        super(test_weave_wdm_next_mutual_subscribe_24, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_24,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_25.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_25.py
index b58be34ad2..9bb994e074 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_25.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_25.py
@@ -33,39 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_25(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_25(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 0
-        wdm_next_args['timer_server_period'] = 10000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F17: Mutual Subscribe: Root path. Null Version. Idle. Client in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F17"
-        super(test_weave_wdm_next_mutual_subscribe_25, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_25,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_26.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_26.py
index d2227fbe7c..b8ffb3555c 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_26.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_26.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_26(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_26(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 10000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F18: Mutual Subscribe: Root path. Null Version. Idle. Publisher in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F18"
-        super(test_weave_wdm_next_mutual_subscribe_26, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_26,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_27.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_27.py
index 3ea8235487..333d54b5a7 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_27.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_27.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_27(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_27(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 2
-        wdm_next_args['timer_server_period'] = 10000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F19: Mutual Subscribe: Root path. Null Version. Idle. Client in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F19"
-        super(test_weave_wdm_next_mutual_subscribe_27, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_27,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_28.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_28.py
index e0e1d7ac28..2f8f428064 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_28.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_28.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_28(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_28(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 10000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F20: Mutual Subscribe: Root path. Null Version. Idle. Publisher in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F20"
-        super(test_weave_wdm_next_mutual_subscribe_28, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_28,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_29.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_29.py
index 83398e27b4..772b977d47 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_29.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_29.py
@@ -33,39 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_29(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_29(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 0
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F21: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F21"
-        super(test_weave_wdm_next_mutual_subscribe_29, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_29,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_30.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_30.py
index 5b5934593c..46999cb1e4 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_30.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_30.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_30(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_30(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F22: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F22"
-        super(test_weave_wdm_next_mutual_subscribe_30, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_30,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_31.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_31.py
index a655066f5a..abb6af5d50 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_31.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_31.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_31(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_31(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 2
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F23: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F23"
-        super(test_weave_wdm_next_mutual_subscribe_31, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_31,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_32.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_32.py
index a4b1dbe0b4..830c3d9d79 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_32.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_32.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_32(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_32(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F24: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in responder Abort']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F24"
-        super(test_weave_wdm_next_mutual_subscribe_32, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_32,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_33.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_33.py
index 468f161603..df5578b6dd 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_33.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_33.py
@@ -33,39 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_33(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_33(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 0
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F25: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Client in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F25"
-        super(test_weave_wdm_next_mutual_subscribe_33, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_33,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_34.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_34.py
index 3365206559..c75ec4eaa7 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_34.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_34.py
@@ -33,41 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_34(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_34(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F26: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Publisher in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F26"
-        super(test_weave_wdm_next_mutual_subscribe_34, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_34,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_35.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_35.py
index 809ee32fa1..5c2f90a0a1 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_35.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_35.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_35(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_35(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 2
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F27: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Client in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F27"
-        super(test_weave_wdm_next_mutual_subscribe_35, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_35,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_36.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_36.py
index 9a03157cff..03235d8d9e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_36.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_36.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_36(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_36(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F28: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Publisher in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F28"
-        super(test_weave_wdm_next_mutual_subscribe_36, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_36,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_37.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_37.py
index afb0b8737d..72016549fd 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_37.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_37.py
@@ -33,39 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_37(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_37(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 0
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F29: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F29"
-        super(test_weave_wdm_next_mutual_subscribe_37, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_37,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_38.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_38.py
index 24f32b61d9..f06dc53558 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_38.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_38.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_38(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_38(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)]\ EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F30: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in responder cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F30"
-        super(test_weave_wdm_next_mutual_subscribe_38, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_38,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_39.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_39.py
index 07e28fbd99..36dbb5d4ec 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_39.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_39.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_39(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_39(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 2
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F31: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F31"
-        super(test_weave_wdm_next_mutual_subscribe_39, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_39,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_40.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_40.py
index b04b409d4b..1ed6248cf8 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_40.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_40.py
@@ -33,40 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_40(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_40(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 4000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F32: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in responder aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F32"
-        super(test_weave_wdm_next_mutual_subscribe_40, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_40,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_41.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_41.py
index 2d414a69c2..dc132bd490 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_41.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_41.py
@@ -33,41 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_41(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_41(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_server_count'] + 1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110', 2),
-                                             ('0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210', 1),
-                                             ('0 ==> 300 ==> 301 ==> 302 ==> 303 ==> 304 ==> 305 ==> 306 ==> 307 ==> 308 ==> 309 ==> 310', 1)]
-
-        wdm_next_args['server_log_check'] = [('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['G01: Mutual Subscribe: Multiple Iterations. Mutate data in responder. Client in initiator aborts. Version is kept.']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test G01"
-        super(test_weave_wdm_next_mutual_subscribe_41, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_41,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_42.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_42.py
index c391f37731..68af75ef51 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_42.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_42.py
@@ -33,41 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_42(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_42(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 1
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'] + 1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'] ),
-                                             ('0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110', 2),
-                                             ('0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210', 1)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['G02: Mutual Subscribe: Multiple Iterations. Mutate data in initiator. Client in initiator aborts. Version is kept.']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test G02"
-        super(test_weave_wdm_next_mutual_subscribe_42, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_42,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_43.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_43.py
index ad6b0bbc30..8a3de4369e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_43.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_43.py
@@ -33,44 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_43(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_43(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_server_count'] + 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110', 2),
-                                             ('0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210', 1),
-                                             ('0 ==> 300 ==> 301 ==> 302 ==> 303 ==> 304 ==> 305 ==> 306 ==> 307 ==> 308 ==> 309 ==> 310', 1)]
-
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'] + 1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110', 2),
-                                             ('0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210', 1)]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['G03: Mutual Subscribe: Multiple Iterations. Mutate data in initiator and responder. Client in initiator aborts. Version is kept']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test G03"
-        super(test_weave_wdm_next_mutual_subscribe_43, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_43,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_44.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_44.py
index 4dc890a25f..2dbe002ce3 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_44.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_44.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_44(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_44(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M25: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I01 and M25"
-        super(test_weave_wdm_next_mutual_subscribe_44, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_44,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_45.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_45.py
index a92447e547..65156072d1 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_45.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_45.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_45(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_45(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M26: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in Initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I02 and M26"
-        super(test_weave_wdm_next_mutual_subscribe_45, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_45,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_46.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_46.py
index 6d3144be13..c729027261 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_46.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_46.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_46(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_46(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M27: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I03 and M27"
-        super(test_weave_wdm_next_mutual_subscribe_46, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_46,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_47.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_47.py
index a9d6703264..0592644c84 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_47.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_47.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_47(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_47(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[ALIVE\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M28: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I04 and M28"
-        super(test_weave_wdm_next_mutual_subscribe_47, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_47,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_48.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_48.py
index c90dccbcdf..7bd7faf55f 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_48.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_48.py
@@ -34,41 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_48(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_48(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M29: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I05 and M29"
-        super(test_weave_wdm_next_mutual_subscribe_48, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_48,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_49.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_49.py
index d6b78fc895..3824b0f3f3 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_49.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_49.py
@@ -34,41 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_49(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_49(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M30: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Publisher in Initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I06 and M30"
-        super(test_weave_wdm_next_mutual_subscribe_49, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_49,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_50.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_50.py
index 03c65db6b0..b0abc47a9e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_50.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_50.py
@@ -34,41 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_50(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_50(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M31: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I07 and M31"
-        super(test_weave_wdm_next_mutual_subscribe_50, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_50,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_51.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_51.py
index f9b0c5084f..68b36f6efc 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_51.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_51.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_51(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_51(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[ALIVE\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M32: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I08 and M32"
-        super(test_weave_wdm_next_mutual_subscribe_51, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_51,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_52.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_52.py
index d42ba1c6fa..c9b9a00688 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_52.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_52.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_52(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_52(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M33: Stress Mutual Subscribe: Initiator Continuous Events. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I09 and M33"
-        super(test_weave_wdm_next_mutual_subscribe_52, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_52,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_53.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_53.py
index 5f51150d3c..c8c60d9e84 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_53.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_53.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_53(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_53(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M34: Stress Mutual Subscribe: Initiator Continuous Events. Publisher in Initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I10 and M34"
-        super(test_weave_wdm_next_mutual_subscribe_53, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_53,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_54.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_54.py
index 08c35015e7..5a66993af4 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_54.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_54.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_54(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_54(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M35: Stress Mutual Subscribe: Initiator Continuous Events. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I11 and M35"
-        super(test_weave_wdm_next_mutual_subscribe_54, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_54,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_55.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_55.py
index 60bc777d56..5df194f8f1 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_55.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_55.py
@@ -34,43 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_55(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_55(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 15000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[ALIVE\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M36: Stress Mutual Subscribe: Initiator Continuous Events. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I12 and M36"
-        super(test_weave_wdm_next_mutual_subscribe_55, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_55,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_56.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_56.py
index df2775481d..783e16d818 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_56.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_56.py
@@ -34,41 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_56(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_56(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 35000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M37: Stress Mutual Subscribe: Responder Continuous Events. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I13 and M37"
-        super(test_weave_wdm_next_mutual_subscribe_56, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_56,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_57.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_57.py
index ac605c36ec..a74f07335d 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_57.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_57.py
@@ -34,41 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_57(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_57(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M38: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Publisher in Initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I14 and M38"
-        super(test_weave_wdm_next_mutual_subscribe_57, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_57,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_58.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_58.py
index c49878cab8..5921790468 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_58.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_58.py
@@ -34,41 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_58(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_58(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M39: Stress Mutual Subscribe: Responder Continuous Events. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I15 and M39"
-        super(test_weave_wdm_next_mutual_subscribe_58, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_58,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_59.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_59.py
index ba455b2bb1..c55addb87a 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_59.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_59.py
@@ -34,42 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_59(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_59(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[ALIVE\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M40: Stress Mutual Subscribe: Responder Continuous Events. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I16 and M40"
-        super(test_weave_wdm_next_mutual_subscribe_59, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_59,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_60.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_60.py
index fa541637fb..d102a5165d 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_60.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_60.py
@@ -34,45 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_60(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_60(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M41: Initiator and Responder Continuous Events. Mutate data in initiator responder. Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I17 and M41"
-        super(test_weave_wdm_next_mutual_subscribe_60, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_60,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_61.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_61.py
index aac4822951..77c21d9e17 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_61.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_61.py
@@ -34,45 +34,11 @@
 class test_weave_wdm_next_mutual_subscribe_61(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_61(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 1
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M42: Stress Mutual Subscribe: Initiator and Responder Continuous Events. Mutate data in initiator and responder. Publisher in initiator cancels']
-        print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I18 and M42"
-        super(test_weave_wdm_next_mutual_subscribe_61, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_61,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_62.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_62.py
index 698b9ec84f..f738215a32 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_62.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_62.py
@@ -34,45 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_62(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_62(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M43: Stress Mutual Subscribe: Initiator and Responder Continuous Events. Mutate data in initiator and responder. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I19 and M43"
-        super(test_weave_wdm_next_mutual_subscribe_62, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_62,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_63.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_63.py
index 540c47a17e..72faa62fa9 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_63.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_63.py
@@ -34,45 +34,12 @@
 class test_weave_wdm_next_mutual_subscribe_63(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_63(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['enable_server_flip'] = 1
-        wdm_next_args['client_event_generator'] = 'Security'
-
-        wdm_next_args['client_inter_event_period'] = 2000
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[ALIVE\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['M44: Stress Mutual Subscribe: Initiator and Responder Continuous Events. Mutate data in initiator and responder. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test I20 and M44"
-        super(test_weave_wdm_next_mutual_subscribe_63, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_63,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_64.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_64.py
index e21bb29e12..1e765e6616 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_64.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_64.py
@@ -33,50 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_64(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_64(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['test_client_case'] = 4
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['test_server_case'] = 4
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Error retrieving data from trait', wdm_next_args['test_client_iterations'] * 2),
-                                             ('trait property is too big so that it fails to fit in the packet', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_client_count'] + 1)),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Error retrieving data from trait', wdm_next_args['test_client_iterations']),
-                                             ('trait property is too big so that it fails to fit in the packet', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['N01: Stress Mutual Subscribe: Oversize trait exists in the end of source trait list at initiator and in the beginning of source trait list at responder.']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test N01"
-        super(test_weave_wdm_next_mutual_subscribe_64, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_64,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_65.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_65.py
index e4979f5980..b214ca17fc 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_65.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_65.py
@@ -33,50 +33,12 @@
 class test_weave_wdm_next_mutual_subscribe_65(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_65(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['test_client_case'] = 5
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 3
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['test_server_case'] = 5
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * 2),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Error retrieving data from trait', wdm_next_args['test_client_iterations'] * 2),
-                                             ('trait property is too big so that it fails to fit in the packet', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] ),
-                                             ('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Error retrieving data from trait', wdm_next_args['test_client_iterations'] * 2),
-                                             ('trait property is too big so that it fails to fit in the packet', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['N02: Stress Mutual Subscribe: Oversize trait exists in the end of source trait list at initiator and in the middle of source trait list at responder.']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test N02"
-        super(test_weave_wdm_next_mutual_subscribe_65, self).weave_wdm_next_test_base(wdm_next_args)
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_mutual_subscribe_65,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_faults.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_faults.py
index e3e4af1657..e27de358f8 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_faults.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_faults.py
@@ -33,7 +33,7 @@
 import re
 import WeaveUtilities
 from happy.Utils import *
-
+import WeaveWdmNextOptions as wwno
 
 from weave_wdm_next_test_base import weave_wdm_next_test_base
 
@@ -49,105 +49,77 @@ def validate_happy_sequence(self):
         counters['client'] = WeaveUtilities.parse_fault_injection_counters(output_logs['client'])
         counters['server'] = WeaveUtilities.parse_fault_injection_counters(output_logs['server'])
 
-        # As of today, all fault points should be executed on the server, but not the WDM Update ones
-        wdm_udpate_faults = [ "Weave_WDMSendUpdateBadVersion",
-                              "Weave_WDMDelayUpdateResponse",
-                              "Weave_WDMUpdateRequestTimeout",
-                              "Weave_WDMUpdateRequestSendErrorInline",
-                              "Weave_WDMUpdateRequestSendErrorAsync",
-                              "Weave_WDMUpdateRequestBadProfile",
-                              "Weave_WDMUpdateResponseBusy",
-                              "Weave_WDMUpdateRequestDropMessage",
-                              "Weave_WDMPathStoreFull"]
+        # As of today, all fault points should be executed on the server, but not
+        # the WDM Update ones
+        wdm_udpate_faults = ["Weave_WDMSendUpdateBadVersion",
+                             "Weave_WDMDelayUpdateResponse",
+                             "Weave_WDMUpdateRequestTimeout",
+                             "Weave_WDMUpdateRequestSendErrorInline",
+                             "Weave_WDMUpdateRequestSendErrorAsync",
+                             "Weave_WDMUpdateRequestBadProfile",
+                             "Weave_WDMUpdateResponseBusy",
+                             "Weave_WDMUpdateRequestDropMessage",
+                             "Weave_WDMPathStoreFull"]
         not_required_server_faults = wdm_udpate_faults
 
-        required_server_faults = [ key for key in counters["server"].keys() if "Weave_WDM" in key and key not in not_required_server_faults]
+        required_server_faults = [key for key in counters["server"].keys(
+        ) if "Weave_WDM" in key and key not in not_required_server_faults]
 
         # This will raise a ValueError
         WeaveUtilities.validate_counters(required_server_faults, counters["server"], "server")
 
         # As of today, the client does not send commands nor updates
-        not_required_client_faults = [ "Weave_WDMSendCommandBadVersion",
-                                       "Weave_WDMSendCommandExpired"]
+        not_required_client_faults = ["Weave_WDMSendCommandBadVersion",
+                                      "Weave_WDMSendCommandExpired"]
         not_required_client_faults += wdm_udpate_faults
 
-        required_client_faults = [ key for key in counters["client"].keys() if "Weave_WDM" in key and key not in not_required_client_faults]
+        required_client_faults = [key for key in counters["client"].keys(
+        ) if "Weave_WDM" in key and key not in not_required_client_faults]
 
         # This will raise a ValueError
         WeaveUtilities.validate_counters(required_client_faults, counters["client"], "client")
 
-
     def setup_log_checks(self):
 
-        # By default, empty the arrays of strings to look for in the logs; rely on the default check for "Good Iteration"
-        self.wdm_next_args['client_log_check'] = []
-        self.wdm_next_args['server_log_check'] = []
+        # By default, empty the arrays of strings to look for in the logs; rely on
+        # the default check for "Good Iteration"
+        self.wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK] = []
+        self.wdm_next_args[wwno.SERVER][wwno.LOG_CHECK] = []
 
         # For some of the exceptions, enforce they are handled in a specific way
-        if self.wdm_next_args['server_faults']:
+        if self.wdm_next_args[wwno.SERVER][wwno.FAULTS]:
 
             #
             # Test the handling of the ExpiryTime and MustBeVersion fields of custom commands
             #
             if "Weave_WDMSendCommandExpired" in self.wdm_next_args['server_faults']:
-                self.wdm_next_args['client_log_check'].append(["Command\[0\] \[.*\] SendError profile: 11, code: 36, err No Error", 1])
-                self.wdm_next_args['server_log_check'].append(["Received Status Report 0xB : 0x24", 1])
-
-            elif "Weave_WDMSendCommandBadVersion" in self.wdm_next_args['server_faults']:
-                self.wdm_next_args['client_log_check'].append(["Command\[0\] \[.*\] SendError profile: 11, code: 37, err No Error", 1])
-                self.wdm_next_args['server_log_check'].append(["Received Status Report 0xB : 0x25", 1])
-
-        if self.wdm_next_args['client_faults']:
+                self.wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK].append(
+                    ["Command\[0\] \[.*\] SendError profile: 11, code: 36, err No Error", 1])
+                elf.wdm_next_args[wwno.SERVER][wwno.LOG_CHECK].append(
+                    ["Received Status Report 0xB : 0x24", 1])
+
+            elif "Weave_WDMSendCommandBadVersion" in self.wdm_next_args[wwno.SERVER][wwno.FAULTS]:
+                self.wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK].append(
+                    ["Command\[0\] \[.*\] SendError profile: 11, code: 37, err No Error", 1])
+                self.wdm_next_args[wwno.SERVER][wwno.LOG_CHECK].append(
+                    ["Received Status Report 0xB : 0x25", 1])
+
+        if self.wdm_next_args[wwno.CLIENT][wwno.FAULTS]:
             pass
 
     def test_weave_wdm_next_mutual_subscribe_faults(self):
 
         # run the sequence once without faults to read the counters
 
-        wdm_next_args = {}
-
-        self.wdm_next_args = wdm_next_args
-
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
 
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_event_generator'] = 'Liveness'
-
-        wdm_next_args['client_inter_event_period'] = 9000
-
-        wdm_next_args['client_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('bound mutual subscription is going away', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', 4),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        base_test_tag = "_MUTUAL_SUB_FAULTS"
-        wdm_next_args['test_tag'] = base_test_tag
-        wdm_next_args['test_case_name'] = ['Mutual subscription happy sequence for fault-injection']
-
-        self.wdm_next_args['client_faults'] = None
-        self.wdm_next_args['server_faults'] = None
+        base_test_tag = wdm_next_args[wwno.TEST][wwno.TEST_TAG]
 
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test mutual with faults"
 
-        super(test_weave_wdm_next_mutual_subscribe_faults, self).weave_wdm_next_test_base(wdm_next_args)
+        super(test_weave_wdm_next_mutual_subscribe_faults,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
         output_logs = {}
         self.output_logs = output_logs
@@ -161,26 +133,27 @@ def test_weave_wdm_next_mutual_subscribe_faults(self):
         # The third one should always succeed; the second one fails only because a fault that
         # was supposed to be triggered at the end of the first one ends up hitting the beginning
         # of the second one instead.
-        wdm_next_args['test_client_iterations'] = 3
-
+        wdm_next_args[wwno.CLIENT][wwno.TEST_ITERATIONS] = 3
         num_tests = 0
 
         for node in gFaultopts.nodes:
             fault_configs = gFaultopts.generate_fault_config_list(node, output_logs[node])
 
             for fault_config in fault_configs:
-                wdm_next_args['test_tag'] = base_test_tag + "_" + str(num_tests) + "_" + node + "_" + fault_config
-                print wdm_next_args['test_tag']
+                wdm_next_args[wwno.TEST][wwno.TEST_TAG] = base_test_tag + \
+                    "_" + str(num_tests) + "_" + node + "_" + fault_config
+                print wdm_next_args[wwno.TEST][wwno.TEST_TAG]
                 if node == 'client':
-                    wdm_next_args['client_faults'] = fault_config
-                    wdm_next_args['server_faults'] = None
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = fault_config
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = None
                 else:
-                    wdm_next_args['client_faults'] = None
-                    wdm_next_args['server_faults'] = fault_config
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = None
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = fault_config
 
-                self.setup_log_checks() 
+                self.setup_log_checks()
 
-                super(test_weave_wdm_next_mutual_subscribe_faults, self).weave_wdm_next_test_base(wdm_next_args)
+                super(test_weave_wdm_next_mutual_subscribe_faults,
+                      self).weave_wdm_next_test_base(wdm_next_args)
                 num_tests += 1
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_01.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_01.py
index e023d97d97..e2da10d334 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_01.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_01.py
@@ -37,35 +37,11 @@
 class test_weave_wdm_next_one_way_subscribe_01(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_01(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L01: Stress One way Subscribe: Root path. Null Version. Client cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test B01 and L01"
-        super(test_weave_wdm_next_one_way_subscribe_01, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_01,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_02.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_02.py
index 8406e9341e..350e367dee 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_02.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_02.py
@@ -34,38 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_02(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_02(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] TimerEventHandler Ref\(\d+\) Timeout',  wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L02: Stress One way Subscribe: Root path. Null Version. Client aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test B02 and L02"
-        super(test_weave_wdm_next_one_way_subscribe_02, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_02,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_03.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_03.py
index 7153c28389..a8d188f106 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_03.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_03.py
@@ -34,38 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_03(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_03(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(CANCL)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L03: Stress One way Subscribe: Root path. Null Version. Idle. Client cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C01 and L03"
-        super(test_weave_wdm_next_one_way_subscribe_03, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_03,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_04.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_04.py
index 6a5ec92b4b..f343ff0c51 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_04.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_04.py
@@ -34,39 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_04(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_04(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L04: Stress One way Subscribe: Root path. Null Version. Idle. Client aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C02 and L04"
-        super(test_weave_wdm_next_one_way_subscribe_04, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_04,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_05.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_05.py
index 361c8cb9a0..22456d48dd 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_05.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_05.py
@@ -34,37 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_05(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_05(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations'] * 1),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'] * 1)]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations'] * 1),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'] * 1)]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L05: Stress One way Subscribe: Root path, Null Version. Mutate data in Publisher. Client cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C03 and L05"
-        super(test_weave_wdm_next_one_way_subscribe_05, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_05,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_06.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_06.py
index 63751d8c98..96813f6d9b 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_06.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_06.py
@@ -34,38 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_06(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_06(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_clear_state_between_iterations'] = True
-        wdm_next_args['server_clear_state_between_iterations'] = True
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[ALIVE\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count'] + 1)),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L06: Stress One way Subscribe: Root path. Null Version. Mutate data in Publisher. Client aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C04 and L06"
-        super(test_weave_wdm_next_one_way_subscribe_06, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_06,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_07.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_07.py
index b3d8077360..6fbdec3ec7 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_07.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_07.py
@@ -33,36 +33,12 @@
 class test_weave_wdm_next_one_way_subscribe_07(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_07(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['B03: One way Subscribe: Root path. Null Version. Publisher cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test B04"
-        super(test_weave_wdm_next_one_way_subscribe_07, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_07,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_08.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_08.py
index 406cb767f5..684bdb51fb 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_08.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_08.py
@@ -33,35 +33,12 @@
 class test_weave_wdm_next_one_way_subscribe_08(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_08(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['B04: One way Subscribe: Root path. Null Version. Publisher aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test B04"
-        super(test_weave_wdm_next_one_way_subscribe_08, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_08,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_09.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_09.py
index cd21dc6d94..552a167d16 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_09.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_09.py
@@ -33,36 +33,12 @@
 class test_weave_wdm_next_one_way_subscribe_09(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_09(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 10000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['C05: One way Subscribe: Root path. Null Version. Idle. Publisher cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C05"
-        super(test_weave_wdm_next_one_way_subscribe_09, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_09,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_10.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_10.py
index 083fdf8b7a..45d17c563b 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_10.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_10.py
@@ -33,34 +33,12 @@
 class test_weave_wdm_next_one_way_subscribe_10(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_10(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['C06: One way Subscribe: Root path, Null Version, Idle, Publisher Abort']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C06"
-        super(test_weave_wdm_next_one_way_subscribe_10, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_10,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_11.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_11.py
index 7720e9df8f..dc340ef65f 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_11.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_11.py
@@ -33,37 +33,12 @@
 class test_weave_wdm_next_one_way_subscribe_11(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_11(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 1
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_server_count'] + 1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])
-                                            ]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])
-                                            ]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['C07: One way Subscribe: Root path. Null Version. Mutate data in publisher. Publisher cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test C07"
-        super(test_weave_wdm_next_one_way_subscribe_11, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_11,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_12.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_12.py
index f607b131cb..e5c0d70297 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_12.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_12.py
@@ -33,31 +33,10 @@
 class test_weave_wdm_next_one_way_subscribe_12(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_12(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 4
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 15000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 3
-        wdm_next_args['timer_server_period'] = 5000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_server_count'] + 1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['C08: One way Subscribe: Root path. Null Version. Mutate data in publisher. Publisher aborts']
         print 'test file: ' + self.__class__.__name__
-        super(test_weave_wdm_next_one_way_subscribe_12, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_12,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_13.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_13.py
index 350d2de6b4..86e87369bb 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_13.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_13.py
@@ -33,38 +33,12 @@
 class test_weave_wdm_next_one_way_subscribe_13(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_13(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 2
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 5000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 2
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 4000
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * wdm_next_args['total_server_count'] + 1),
-                                             ('0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110', 2),
-                                             ('0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210', 1),
-                                             ('0 ==> 300 ==> 301 ==> 302 ==> 303 ==> 304 ==> 305 ==> 306 ==> 307 ==> 308 ==> 309 ==> 310', 1)]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] TimerEventHandler Ref\(\d+\) Timeout', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] \[(ALIVE|CONFM)\] AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['D01: One way Subscribe: Multiple Iterations. Mutate data in publisher. Client aborts. Version is kept']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test D01"
-        super(test_weave_wdm_next_one_way_subscribe_13, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_13,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_14.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_14.py
index 9361774904..009161a45e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_14.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_14.py
@@ -34,38 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_14(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_14(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[CANCL\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L07: Stress One way Subscribe: Publisher Continuous Events. Publisher mutates trait data. Client cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test H01 and L07"
-        super(test_weave_wdm_next_one_way_subscribe_14, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_14,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_15.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_15.py
index 96a24c38b2..1d3f5d866a 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_15.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_15.py
@@ -34,37 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_15(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_15(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 1
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L08: Stress One way Subscribe: Publisher Continuous Events. Publisher mutates trait data. Client aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test H02 and L08"
-        super(test_weave_wdm_next_one_way_subscribe_15, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_15,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_16.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_16.py
index 8c8049ff0b..c2a5db8856 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_16.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_16.py
@@ -34,38 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_16(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_16(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[CANCL\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L09: Stress One way Subscribe: Publisher Continuous Events. Client cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test B03 and L09"
-        super(test_weave_wdm_next_one_way_subscribe_16, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_16,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_17.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_17.py
index 3e107831d4..f8f4132035 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_17.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_one_way_subscribe_17.py
@@ -34,38 +34,12 @@
 class test_weave_wdm_next_one_way_subscribe_17(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_one_way_subscribe_17(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 4
-        wdm_next_args['final_client_status'] = 2
-        wdm_next_args['timer_client_period'] = 16000
-        wdm_next_args['test_client_iterations'] = 5
-        wdm_next_args['test_client_delay'] = 35000
-        wdm_next_args['enable_client_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 4
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 15000
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['server_event_generator'] = 'Security'
-
-        wdm_next_args['server_inter_event_period'] = 2000
-
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] HandleSubscriptionTerminated', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['L10: Stress One way Subscribe: Publisher Continuous Events. Client cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test H04 and L10"
-        super(test_weave_wdm_next_one_way_subscribe_17, self).weave_wdm_next_test_base(wdm_next_args)
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
+        super(test_weave_wdm_next_one_way_subscribe_17,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
     WeaveUtilities.run_unittest()
-
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_resub.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_resub.py
index 3d80f5013e..19d0b2ad63 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_resub.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_resub.py
@@ -31,7 +31,7 @@
 import unittest
 import set_test_path
 import WeaveUtilities
-
+import WeaveWdmNextOptions as wwno
 
 from weave_wdm_next_test_base import weave_wdm_next_test_base
 
@@ -41,67 +41,45 @@
 class test_weave_wdm_next_oneway_resub(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_oneway_resub(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['enable_client_stop'] = True
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 0
-        wdm_next_args['enable_retry'] = True
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_stop'] = False
-        wdm_next_args['test_server_iterations'] = 1
-        wdm_next_args['enable_server_flip'] = 0
-
-        base_test_tag = "_ONEWAY_RESUB"
-        wdm_next_args['test_tag'] = base_test_tag
-        wdm_next_args['test_case_name'] = ['N03: One way Subscribe: Root path, Null Version, Resubscribe On Error']
-
-        # We're going to run once, but expect a successful subscription since
-        # retries are enabled.
-        NUM_ITERATIONS = 1
-        wdm_next_args['test_client_iterations'] = NUM_ITERATIONS
-        wdm_next_args['server_log_check'] = []
-
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         fault_list = {}
         fault_list['server'] = [
-                # fail to create the first subscription handler on the
-                # server side. this sends a StatusReport to the client
-                # in the subscribing stage, which triggers another
-                # subscribe request to be sent.
-                ('Weave_WDMSubscriptionHandlerNew_s0_f1', 2)
-                ]
+            # fail to create the first subscription handler on the
+            # server side. this sends a StatusReport to the client
+            # in the subscribing stage, which triggers another
+            # subscribe request to be sent.
+            ('Weave_WDMSubscriptionHandlerNew_s0_f1', 2)
+        ]
         fault_list['client'] = [
-                # fail 3 instances of a send error after allowing the first.
-                # this will cause a failure after the subscription has been
-                # established. fail a few instances to confirm the retries
-                # continue. this tests the OnSendError and OnResponseTimeout
-                # callbacks in WDM.
-                ('Weave_WRMSendError_s1_f3', 4)
-                ]
+            # fail 3 instances of a send error after allowing the first.
+            # this will cause a failure after the subscription has been
+            # established. fail a few instances to confirm the retries
+            # continue. this tests the OnSendError and OnResponseTimeout
+            # callbacks in WDM.
+            ('Weave_WRMSendError_s1_f3', 4)
+        ]
+
+        base_test_tag = wdm_next_args[wwno.TEST][wwno.TEST_TAG]
 
         for node in gFaultopts.nodes:
             for fault_config, expected_retries in fault_list[node]:
-                wdm_next_args['client_log_check'] = [("Good Iteration", NUM_ITERATIONS),
-                                                     ('SendSubscribeRequest', NUM_ITERATIONS * expected_retries)]
-                wdm_next_args['test_tag'] = base_test_tag + "_" + fault_config
-                print wdm_next_args['test_tag']
+                wdm_next_args[wwno.CLIENT][wwno.LOG_CHECK] = [
+                    ("Good Iteration", wdm_next_args[wwno.CLIENT][wwno.TEST_ITERATIONS]),
+                    ('SendSubscribeRequest', wdm_next_args[wwno.CLIENT][
+                     wwno.TEST_ITERATIONS] * expected_retries)
+                ]
+                wdm_next_args[wwno.TEST][wwno.TEST_TAG] = base_test_tag + "_" + fault_config
+                print wdm_next_args[wwno.TEST][wwno.TEST_TAG]
                 if node == 'client':
-                    wdm_next_args['client_faults'] = fault_config
-                    wdm_next_args['server_faults'] = None
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = fault_config
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = None
                 else:
-                    wdm_next_args['client_faults'] = None
-                    wdm_next_args['server_faults'] = fault_config
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = None
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = fault_config
 
-                super(test_weave_wdm_next_oneway_resub, self).weave_wdm_next_test_base(wdm_next_args)
+                super(
+                    test_weave_wdm_next_oneway_resub,
+                    self).weave_wdm_next_test_base(wdm_next_args)
 
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_subscribe_faults.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_subscribe_faults.py
index 000968d851..5384615407 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_subscribe_faults.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_oneway_subscribe_faults.py
@@ -30,7 +30,7 @@
 import unittest
 import set_test_path
 import WeaveUtilities
-
+import WeaveWdmNextOptions as wwno
 
 from weave_wdm_next_test_base import weave_wdm_next_test_base
 
@@ -43,44 +43,15 @@ def test_weave_wdm_next_oneway_subscribe_faults(self):
 
         # run the sequence once without faults to read the counters
 
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        # Total_client_count is set to 1 even if the responder does not subscribe back.
-        # This is done so that the client waits 3 seconds before canceling the subscription,
-        # and the responder in the mean time gets a chance to modify the trait instance.
-        wdm_next_args['total_client_count'] = 1
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 3000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-
-        wdm_next_args['total_server_count'] = 1
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 2000 
-        wdm_next_args['test_server_delay'] = 0
-        wdm_next_args['enable_server_flip'] = 1
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
 
-        wdm_next_args['client_log_check'] = [('Client\[0\] \[(ALIVE|CONFM)\] EndSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client\[0\] \[CANCL\] _AbortSubscription Ref\(\d+\)', wdm_next_args['test_client_iterations']),
-                                             ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations'] * (wdm_next_args['total_server_count']) +1),
-                                             ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-        wdm_next_args['server_log_check'] = [('Handler\[0\] \[(ALIVE|CONFM)\] CancelRequestHandler', wdm_next_args['test_client_iterations']),
-                                             ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
-
-        base_test_tag = "_ONEWAY_SUB_FAULTS"
-        wdm_next_args['test_tag'] = base_test_tag
-        wdm_next_args['test_case_name'] = ['One way subscription happy sequence for fault injection']
-
-        wdm_next_args['client_faults'] = None
-        wdm_next_args['server_faults'] = None
+        base_test_tag = wdm_next_args[wwno.TEST][wwno.TEST_TAG]
 
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test one way with faults"
 
-        super(test_weave_wdm_next_oneway_subscribe_faults, self).weave_wdm_next_test_base(wdm_next_args)
+        super(test_weave_wdm_next_oneway_subscribe_faults,
+              self).weave_wdm_next_test_base(wdm_next_args)
 
         output_logs = {}
         output_logs['client'] = self.result_data[0]['client_output']
@@ -90,27 +61,25 @@ def test_weave_wdm_next_oneway_subscribe_faults(self):
         # The third one should always succeed; the second one fails only because a fault that
         # was supposed to be triggered at the end of the first one ends up hitting the beginning
         # of the second one instead.
-        wdm_next_args['test_client_iterations'] = 3
-        # empty the arrays of strings to look for in the logs; rely on the default check for "Good Iteration"
-        wdm_next_args['client_log_check'] = []
-        wdm_next_args['server_log_check'] = []
-
+        wdm_next_args[wwno.CLIENT][wwno.TEST_ITERATIONS] = 3
         num_tests = 0
 
         for node in gFaultopts.nodes:
             fault_configs = gFaultopts.generate_fault_config_list(node, output_logs[node])
-        
+
             for fault_config in fault_configs:
-                wdm_next_args['test_tag'] = base_test_tag + "_" + str(num_tests) + "_" + node + "_" + fault_config
-                print wdm_next_args['test_tag']
+                wdm_next_args[wwno.TEST][wwno.TEST_TAG] = base_test_tag + "_" + \
+                    str(num_tests) + "_" + node + "_" + fault_config
+                print wdm_next_args[wwno.TEST][wwno.TEST_TAG]
                 if node == 'client':
-                    wdm_next_args['client_faults'] = fault_config
-                    wdm_next_args['server_faults'] = None
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = fault_config
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = None
                 else:
-                    wdm_next_args['client_faults'] = None
-                    wdm_next_args['server_faults'] = fault_config
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = None
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = fault_config
 
-                super(test_weave_wdm_next_oneway_subscribe_faults, self).weave_wdm_next_test_base(wdm_next_args)
+                super(test_weave_wdm_next_oneway_subscribe_faults,
+                      self).weave_wdm_next_test_base(wdm_next_args)
                 num_tests += 1
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_subless_notify_01.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_subless_notify_01.py
index da3114101c..642af9aa82 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_subless_notify_01.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_subless_notify_01.py
@@ -35,36 +35,13 @@
 
 
 gFaultOpts = WeaveUtilities.FaultInjectionOptions()
-gOptions = { 'enableFaults': False, 'mode': "local" }
+gOptions = {'enableFaults': False, 'mode': "local"}
+
 
 class test_weave_wdm_next_subless_notify_01(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_subless_notify_01(self):
-        wdm_next_args = {}
-
-        wdm_next_args['wdm_option'] = "subless_notify"
-
-        wdm_next_args['total_client_count'] = 0
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 0
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_server_iterations'] = 1
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['test_server_delay'] = 1000
-        wdm_next_args['client_log_check'] = []
-        wdm_next_args['server_log_check'] = []
-
-        wdm_next_args['timeout'] = 10
-
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['O01: Subscriptionless Notify: Publisher sends subscriptionless notify to receiver, and receiver notifies application after processing trait data'
-        ]
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test O01"
         super(test_weave_wdm_next_subless_notify_01, self).weave_wdm_next_test_base(wdm_next_args)
@@ -72,40 +49,33 @@ def test_weave_wdm_next_subless_notify_01(self):
         if not gOptions['enableFaults']:
             return
 
-        base_test_tag = "_SUBLESS_NOTIFY_FAULTS"
-        wdm_next_args['test_tag'] = base_test_tag
-        wdm_next_args['test_case_name'] = ['WDM Subscriptionless Notification for fault injection']
-
-        wdm_next_args['client_faults'] = None
-        wdm_next_args['server_faults'] = None
+        base_test_tag = wdm_next_args[wwno.TEST][wwno.TEST_TAG]
+        wdm_next_args[wwno.TEST][wwno.TEST_CASE_NAME] = [
+            'WDM Subscriptionless Notification for fault injection']
 
         output_logs = {}
         output_logs['client'] = self.result_data[0]['client_output']
         output_logs['server'] = self.result_data[0]['server_output']
 
-
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_server_iterations'] = 1
-
-        # empty the arrays of strings to look for in the logs; rely on the default check for "Good Iteration"
-        wdm_next_args['client_log_check'] = []
-        wdm_next_args['server_log_check'] = []
         num_tests = 0
 
         for node in gFaultOpts.nodes:
             fault_configs = gFaultOpts.generate_fault_config_list(node, output_logs[node])
 
             for fault_config in fault_configs:
-                wdm_next_args['test_tag'] = base_test_tag + "_" + str(num_tests) + "_" + node + "_" + fault_config
-                print wdm_next_args['test_tag']
+                wwdm_next_args[wwno.TEST][wwno.TEST_TAG] = base_test_tag + "_" + \
+                    str(num_tests) + "_" + node + "_" + fault_config
+                print wdm_next_args[wwno.TEST][wwno.TEST_TAG]
                 if node == 'client':
-                    wdm_next_args['client_faults'] = fault_config
-                    wdm_next_args['server_faults'] = None
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = fault_config
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = None
                 else:
-                    wdm_next_args['client_faults'] = None
-                    wdm_next_args['server_faults'] = fault_config
+                    wdm_next_args[wwno.CLIENT][wwno.FAULTS] = None
+                    wdm_next_args[wwno.SERVER][wwno.FAULTS] = fault_configt_config
 
-                super(test_weave_wdm_next_subless_notify_01, self).weave_wdm_next_test_base(wdm_next_args)
+                super(
+                    test_weave_wdm_next_subless_notify_01,
+                    self).weave_wdm_next_test_base(wdm_next_args)
                 num_tests += 1
 
 if __name__ == "__main__":
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py
index f6d6d0576b..0464afa93f 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_01.py
@@ -35,39 +35,9 @@
 class test_weave_wdm_next_update_01(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_01(self):
-        wdm_next_args = {}
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 1
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTrait
-
-        wdm_next_args['enable_retry'] = True
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-        wdm_next_args['test_server_case'] = 10
-
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['server_clear_state_between_iterations'] = False
-
-        wdm_next_args['client_update_mutation'] = "OneLeaf"
-        wdm_next_args['client_update_conditionality'] = "Conditional"
-        wdm_next_args['client_update_num_mutations'] = 1
-        wdm_next_args['client_update_timing'] = "AfterSub"
-
-        wdm_next_args['client_log_check'] = [('Update: path result: success', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'])]
-        wdm_next_args['server_log_check'] = []
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['Update 01: Client creates mutual subscription, sends conditional update request to publisher, and receives notification and status report']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next update test 01"
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         super(test_weave_wdm_next_update_01, self).weave_wdm_next_test_base(wdm_next_args)
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py
index 7c231cdfb4..070d61b5d9 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_02.py
@@ -35,39 +35,9 @@
 class test_weave_wdm_next_update_02(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_02(self):
-        wdm_next_args = {}
-        wdm_next_args['wdm_option'] = "mutual_subscribe"
-
-        wdm_next_args['total_client_count'] = 1
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTrait
-
-        wdm_next_args['enable_retry'] = True
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-        wdm_next_args['test_server_case'] = 10
-
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['server_clear_state_between_iterations'] = False
-
-        wdm_next_args['client_update_mutation'] = "OneLeaf"
-        wdm_next_args['client_update_conditionality'] = "Unconditional"
-        wdm_next_args['client_update_num_mutations'] = 1
-        wdm_next_args['client_update_timing'] = "AfterSub"
-
-        wdm_next_args['client_log_check'] = [('Update: path result: success', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'])]
-        wdm_next_args['server_log_check'] = []
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['Update 02: Client creates mutual subscription, sends unconditional update request to publisher, and receives notification and status report']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next update test 02"
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         super(test_weave_wdm_next_update_02, self).weave_wdm_next_test_base(wdm_next_args)
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
index 3ae7e53e40..350045a11e 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_update_03.py
@@ -34,39 +34,9 @@
 class test_weave_wdm_next_update_03(weave_wdm_next_test_base):
 
     def test_weave_wdm_next_mutual_subscribe_03(self):
-        wdm_next_args = {}
-        wdm_next_args['wdm_option'] = "one_way_subscribe"
-
-        wdm_next_args['total_client_count'] = 1
-        wdm_next_args['final_client_status'] = 0
-        wdm_next_args['timer_client_period'] = 10000
-        wdm_next_args['test_client_iterations'] = 1
-        wdm_next_args['test_client_delay'] = 2000
-        wdm_next_args['enable_client_flip'] = 1
-        wdm_next_args['test_client_case'] = 10 # kTestCase_TestUpdatableTrait
-
-        wdm_next_args['enable_retry'] = True
-
-        wdm_next_args['total_server_count'] = 0
-        wdm_next_args['final_server_status'] = 4
-        wdm_next_args['timer_server_period'] = 0
-        wdm_next_args['enable_server_flip'] = 0
-        wdm_next_args['test_server_case'] = 10
-
-        wdm_next_args['client_clear_state_between_iterations'] = False
-        wdm_next_args['server_clear_state_between_iterations'] = False
-
-        wdm_next_args['client_update_mutation'] = "OneLeaf"
-        wdm_next_args['client_update_conditionality'] = "Unconditional"
-        wdm_next_args['client_update_num_mutations'] = 1
-        wdm_next_args['client_update_timing'] = "NoSub"
-
-        wdm_next_args['client_log_check'] = [('Update: path result: success', wdm_next_args['test_client_iterations'] * wdm_next_args['total_client_count'])]
-        wdm_next_args['server_log_check'] = []
-        wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['Update 03: Client sends standalone unconditional update request to publisher, and receives status report']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next update test 03"
+        wdm_next_args = self.get_test_param_json(self.__class__.__name__)
         super(test_weave_wdm_next_update_03, self).weave_wdm_next_test_base(wdm_next_args)
 
 
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_base.py b/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_base.py
index e405ea2191..3686e96709 100755
--- a/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_base.py
+++ b/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_base.py
@@ -24,100 +24,129 @@
 #
 
 import itertools
+import json
 import os
 import re
-import unittest
 import set_test_path
+import unittest
 
 from happy.Utils import *
 import happy.HappyNodeList
+import plugins.testrail.TestrailResultOutput
 import WeaveStateLoad
 import WeaveStateUnload
 import WeaveWdmNext
-import plugins.testrail.TestrailResultOutput
-
-test_option_quiet = True
-test_option_all_nodes = False
+import WeaveWdmNextOptions as wwno
 
+TEST_OPTION_ALL_NODES = False
 TESTRAIL_SECTION_NAME = 'WDM-Next test suite between Mock-Client and Mock-Service'
 TESTRAIL_SUFFIX = "_TESTRAIL.json"
 
-class weave_wdm_next_test_base(unittest.TestCase):
-    def setUp(self):
-        self.tap = None
-        self.wdm_option = None
-        self.options = None
 
-        if "WDM_CLIENT_LIVENESS_CHECK_PERIOD" in os.environ.keys():
-            self.wdm_client_liveness_check_period = int(os.environ["WDM_CLIENT_LIVENESS_CHECK_PERIOD"])
-        else:
-            self.wdm_client_liveness_check_period = None
-
-        if "WDM_SERVER_LIVENESS_CHECK_PERIOD" in os.environ.keys():
-            self.wdm_server_liveness_check_period = int(os.environ["WDM_SERVER_LIVENESS_CHECK_PERIOD"])
-        else:
-            self.wdm_server_liveness_check_period = None
+class weave_wdm_next_test_base(unittest.TestCase):
 
-        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ["WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
-            self.topology_file = os.path.dirname(os.path.realpath(__file__)) + \
+    @classmethod
+    def setUpClass(cls):
+        """
+        Set up the weave toplogy.
+        """
+        cls.tap = None
+        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ[
+                "WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
+            cls.topology_file = os.path.dirname(os.path.realpath(__file__)) + \
                 "/../../../topologies/standalone/three_nodes_on_tap_thread_weave.json"
-            self.tap = "wpan0"
+            cls.tap = "wpan0"
         else:
-            self.topology_file = os.path.dirname(os.path.realpath(__file__)) + \
+            cls.topology_file = os.path.dirname(os.path.realpath(__file__)) + \
                 "/../../../topologies/standalone/three_nodes_on_thread_weave.json"
 
-        self.show_strace = False
-
         # setting Mesh for thread test
         options = WeaveStateLoad.option()
         options["quiet"] = True
-        options["json_file"] = self.topology_file
+        options["json_file"] = cls.topology_file
 
         setup_network = WeaveStateLoad.WeaveStateLoad(options)
-        ret = setup_network.run()
+        setup_network.run()
+
+    def setUp(self):
+        """
+        Load the default test parameters.
+        """
+        self.wdm_option = None
+        self.options = WeaveWdmNext.option()
 
+        if "WDM_CLIENT_LIVENESS_CHECK_PERIOD" in os.environ.keys():
+            self.options[wwno.CLIENT][wwno.LIVENESS_CHECK_PERIOD] = int(
+                os.environ["WDM_CLIENT_LIVENESS_CHECK_PERIOD"])
+        else:
+            self.options[wwno.CLIENT][wwno.LIVENESS_CHECK_PERIOD] = None
+
+        if "WDM_SERVER_LIVENESS_CHECK_PERIOD" in os.environ.keys():
+            self.options[wwno.SERVER][wwno.LIVENESS_CHECK_PERIOD] = int(
+                os.environ["WDM_SERVER_LIVENESS_CHECK_PERIOD"])
+        else:
+            self.options[wwno.SERVER][wwno.LIVENESS_CHECK_PERIOD] = None
+
+        self.show_strace = False
+        self.options[wwno.CLIENT][wwno.TAP] = self.tap
+        self.options[wwno.SERVER][wwno.TAP] = self.tap
 
-    def tearDown(self):
-        # cleaning up
+    @classmethod
+    def tearDownClass(cls):
+        """
+        Tear down the toplogy.
+        """
         options = WeaveStateUnload.option()
         options["quiet"] = True
-        options["json_file"] = self.topology_file
+        options["json_file"] = cls.topology_file
 
         teardown_network = WeaveStateUnload.WeaveStateUnload(options)
         teardown_network.run()
 
+    @staticmethod
+    def generate_test(wdm_next_args):
+        """
+        Generate individual test cases for a group of tests.
+
+        Args:
+            wdm_next_args (dict): Test parameters.
+
+        Returns:
+            func: Function that runs a test given wdm arguments.
+        """
+
+        def test(self):
+            self.weave_wdm_next_test_base(wdm_next_args)
+        return test
+
+    @staticmethod
+    def get_test_param_json(test_name):
+        """
+        Retrieve the test params for a particular test.
+
+        Args:
+            test_name (str): Name of the test.
+
+        Returns:
+            dict: Dictionary containing test, client, and server test params.
+        """
+        curr_file_dir = os.path.dirname(os.path.abspath(__file__))
+        test_param_json_path = "{}/weave_wdm_next_test_params.json".format(curr_file_dir)
+        with open(test_param_json_path) as json_file:
+            data = json.load(json_file)
+            return data[test_name]
 
     def weave_wdm_next_test_base(self, wdm_next_args):
-        options = happy.HappyNodeList.option()
-        default_options = {'test_client_case' : 1,
-                           'test_server_case' : 1,
-                           'save_client_perf' : False,
-                           'save_server_perf' : False,
-                           'test_server_delay' : 0,
-                           'timeout' : 60*15,
-                           'client_event_generator' : None,
-                           'client_inter_event_period' : None,
-                           'client_faults' : None,
-                           'server_event_generator' : None,
-                           'server_inter_event_period' : None,
-                           'server_faults' : None,
-                           'test_case_name' : [],
-                           'strace': False,
-                           'enable_client_dictionary_test' : True,
-                           'wdm_client_liveness_check_period': self.wdm_client_liveness_check_period,
-                           'wdm_server_liveness_check_period': self.wdm_server_liveness_check_period,
-                           'enable_retry': False,
-                           'enable_mock_event_timestamp_initial_counter': True
-                           }
-
-        default_options.update(wdm_next_args)
-
-        self.__dict__.update(default_options)
-        self.default_options = default_options
+        """
+        Initiate wdm next test between nodes given test parameters.
 
+        Args:
+            wdm_next_args (dict): Test parameters.
+        """
+        options = happy.HappyNodeList.option()
         self.test_results = []
 
-        if test_option_all_nodes is True:
+        if TEST_OPTION_ALL_NODES:
             nodes_list = happy.HappyNodeList.HappyNodeList(options)
             ret = nodes_list.run()
 
@@ -128,117 +157,177 @@ def weave_wdm_next_test_base(self, wdm_next_args):
                 if pair[0] == pair[1]:
                     print "Skip weave-wdm test on client and server running on the same node."
                     continue
-                value, data = self.__run_wdm_test_between(pair[0], pair[1])
-                self.__process_result(pair[0], pair[1], value, data)
+                success, data = self.__run_wdm_test_between(pair[0], pair[1], wdm_next_args)
+                self.__process_result(pair[0], pair[1], success, data)
         else:
-            value, data = self.__run_wdm_test_between("node01", "node02")
-            self.__process_result("node01", "node02", value, data)
+            success, data = self.__run_wdm_test_between("node01", "node02", wdm_next_args)
+            self.__process_result("node01", "node02", success, data)
             self.result_data = data
 
     def __validate_log_line(self, data, node_type, wdm_stress_check, stress_failures):
         """
-        check expected log lines showed up in node logs with expected count
+        Validate log lines for client/server nodes based on expected count.
+
+        Args:
+            data (dict): Holds client/server log lines.
+            node_type (str): Denote client/server.
+            wdm_stress_check (bool): Whether stress test is passing (so far).
+            stress_failures (list): List of failure messages.
+
+        Returns:
+            (bool, list): Whether stress test passed so far and list of failure messages.
         """
         if node_type == "client":
             node_log = data["client_output"]
-            log_check_list = self.client_log_check
+            log_check_list = self.options[wwno.CLIENT][wwno.LOG_CHECK]
         else:
             node_log = data["server_output"]
-            log_check_list = self.server_log_check
+            log_check_list = self.options[wwno.SERVER][wwno.LOG_CHECK]
         for expect_line_count in log_check_list:
             item_output_cnt = len(re.findall(expect_line_count[0], node_log))
             if item_output_cnt != expect_line_count[1]:
                 wdm_stress_check = False
-                error = "missing '%s' in %s_output, need %d, actual %d" % (expect_line_count[0], node_type, expect_line_count[1], item_output_cnt)
+                error = "missing '%s' in %s_output, need %d, actual %d" % (
+                    expect_line_count[0], node_type, expect_line_count[1], item_output_cnt)
                 stress_failures.append(error)
         return (wdm_stress_check, stress_failures)
 
     def __validate_node_events(self, wdm_stress_check, stress_failures, data, client_gen):
         """
-        validate events from client and publisher, event count should be equal from client and publisher
-        client: send events
-        publisher: publish events
+        Validate the event counts for client/publisher.
+
+        Args:
+            wdm_stress_check (bool): Whether stress test is passing (so far).
+            stress_failures (list): List of failure messages.
+            data (dict): Dict holding client/server events.
+            client_gen (bool): Whether client or server sends the events.
+
+        Returns:
+            (bool, list): Whether stress test passed so far and list of failure messages.
         """
-        if client_gen: # client send events, server publish events
+        if client_gen:  # client send events, server publish events
             client_output = data["client_output"]
             publisher_output = data["server_output"]
-            node_role = {"client":"client",
-                         "publisher":"server"
-                        }
-        else: # server send events, client publish events
+            node_role = {
+                "client": "client",
+                "publisher": "server"
+            }
+        else:  # server send events, client publish events
             client_output = data["server_output"]
             publisher_output = data["client_output"]
-            node_role = {"client":"server",
-                         "publisher":"client"
-                        }
+            node_role = {
+                "client": "server",
+                "publisher": "client"
+            }
         client_event_dic = self.weave_wdm.wdm_next_client_event_sequence_process(client_output)
-        publisher_event_dic = self.weave_wdm.wdm_next_publisher_event_sequence_process(publisher_output)
-        if not ((client_event_dic['success']) is True and (publisher_event_dic['success'] is True) and (client_event_dic['client_event_list'] == publisher_event_dic['publisher_event_list'])):
+        publisher_event_dic = self.weave_wdm.wdm_next_publisher_event_sequence_process(
+            publisher_output)
+        if not (client_event_dic['success'] and publisher_event_dic['success'] and (
+                client_event_dic['client_event_list'] == publisher_event_dic['publisher_event_list'])):
             wdm_stress_check = False
             error = "The events sent from the client to the server don't match"
             stress_failures.append(error)
-            stress_failures.append("\tevents sent by the " + node_role["client"] + ": " + str(client_event_dic))
-            stress_failures.append("\tevents received by the "+ node_role["publisher"]+": " + str(publisher_event_dic))
+            stress_failures.append(
+                "\tevents sent by the " +
+                node_role["client"] +
+                ": " +
+                str(client_event_dic))
+            stress_failures.append(
+                "\tevents received by the " +
+                node_role["publisher"] +
+                ": " +
+                str(publisher_event_dic))
         return (wdm_stress_check, stress_failures)
 
-    def __process_result(self, nodeA, nodeB, value, data):
-        print "weave-wdm-next %s from " % self.wdm_option + nodeA + " to " + nodeB + " "
+    def __process_result(self, nodeA, nodeB, success, data):
+        """
+        Process the weave wdm next test results.
+
+        Args:
+            nodeA (str): First node identifier.
+            nodeB (str): Second node identifier.
+            success (bool): Whether test executed successfully without parser/leak errors.
+            data (list): Results from weave wdm test including node logs.
+        """
+        print "weave-wdm-next {}\n {} from {} to {}".format(
+            self.options[wwno.TEST][wwno.TEST_CASE_NAME][0],
+            self.options[wwno.TEST][wwno.WDM_OPTION], nodeA, nodeB)
         data = data[0]
         test_results = []
-        wdm_stress_check = value
+        wdm_stress_check = success
         wdm_stress_diag_list = []
-        tag_and_paramenters = 'test_file: %s\nparameters: %s\n' % (self.test_tag, str(self.options))
+        tag_and_paramenters = 'test_file: {}\nparameters: {}\n'.format(
+            self.options[wwno.TEST][wwno.TEST_TAG], self.options)
 
         # collect all problems in a list of strings to pass to the assert at the end of the test
         wdm_stress_diag_list.append(tag_and_paramenters)
         wdm_stress_diag_list.append(str(data['success_dic']))
 
-        stress_failures = ["There is a failure in the overall test; log file tag: " + self.test_tag]
-        if not value:
+        stress_failures = [
+            "There is a failure in the overall test; log file tag: {}".format(
+                self.options[wwno.TEST][wwno.TEST_TAG])]
+        if not success:
             # This means something failed and it was caught in the WeaveWdmNext plugin
             stress_failures.append(str(data['success_dic']))
 
         success_iterations_count = len(re.findall("Good Iteration", data["client_output"]))
-        success_iterations_rate_string = "success rate(success iterations/total iterations)" \
-                                         + str(success_iterations_count) \
-                                         + "/" + str(self.test_client_iterations) \
-                                         + " = " + str(success_iterations_count/float(self.test_client_iterations))
+        success_rate = round(success_iterations_count /
+                             float(self.options[wwno.CLIENT][wwno.TEST_ITERATIONS]), 2)
+        success_iterations_rate_string = "success rate(success iterations/total iterations) " \
+                                         "{}/{} = {}".format(
+                                             success_iterations_count,
+                                             self.options[wwno.CLIENT][wwno.TEST_ITERATIONS],
+                                             success_rate)
+
         wdm_stress_diag_list.append(success_iterations_rate_string)
 
-        if success_iterations_count != self.test_client_iterations and not (self.client_faults or self.server_faults):
+        if success_iterations_count != self.options[wwno.CLIENT][wwno.TEST_ITERATIONS] and not \
+                (self.options[wwno.CLIENT][wwno.FAULTS] or self.options[wwno.SERVER][wwno.FAULTS]):
+            # There are failures but no faults configured
             stress_failures.append(success_iterations_rate_string)
 
         # check both client and server log for expected log filters with expected counts
-        wdm_stress_check, stress_failures = self.__validate_log_line(data, "client", wdm_stress_check, stress_failures)
-        wdm_stress_check, stress_failures = self.__validate_log_line(data, "server", wdm_stress_check, stress_failures)
+        wdm_stress_check, stress_failures = self.__validate_log_line(
+            data, "client", wdm_stress_check, stress_failures)
+        wdm_stress_check, stress_failures = self.__validate_log_line(
+            data, "server", wdm_stress_check, stress_failures)
 
-        if not (self.client_faults or self.server_faults):
-            if self.client_event_generator is not None:
-                wdm_stress_check, stress_failures = self.__validate_node_events(wdm_stress_check, stress_failures, data, True)
+        if not (self.options[wwno.CLIENT][wwno.FAULTS] or self.options[wwno.SERVER][wwno.FAULTS]):
+            if self.options[wwno.CLIENT][wwno.EVENT_GENERATOR]:
+                wdm_stress_check, stress_failures = self.__validate_node_events(
+                    wdm_stress_check, stress_failures, data, True)
 
-            if self.server_event_generator is not None:
-                wdm_stress_check, stress_failures = self.__validate_node_events(wdm_stress_check, stress_failures, data, False)
+            if self.options[wwno.SERVER][wwno.EVENT_GENERATOR]:
+                wdm_stress_check, stress_failures = self.__validate_node_events(
+                    wdm_stress_check, stress_failures, data, False)
 
-            if self.server_event_generator is None and self.client_event_generator is None:
-                client_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(data["client_output"])
+            if not self.options[wwno.CLIENT][wwno.EVENT_GENERATOR] and not self.options[
+                    wwno.SERVER][wwno.EVENT_GENERATOR]:
+                client_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(data[
+                                                                                      "client_output"])
 
-                server_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(data["server_output"])
+                server_checksum_list = self.weave_wdm.wdm_next_checksum_check_process(data[
+                                                                                      "server_output"])
 
                 if client_checksum_list != server_checksum_list:
                     wdm_stress_check = False
                     wdm_stress_diag_list.append("mismatched trait checksum:")
                     error = "Mismatch in the trait data checksums:"
                     stress_failures.append(error)
-                    stress_failures.append("\tchecksums on the client: " + str(client_checksum_list))
-                    stress_failures.append("\tchecksums on the server: " + str(server_checksum_list))
+                    stress_failures.append(
+                        "\tchecksums on the client: " +
+                        str(client_checksum_list))
+                    stress_failures.append(
+                        "\tchecksums on the server: " +
+                        str(server_checksum_list))
                 wdm_stress_diag_list.append('initiator:' + str(client_checksum_list))
                 wdm_stress_diag_list.append('responder:' + str(server_checksum_list))
 
         test_results.append({
-            'testName': self.test_case_name[0],
+            'testName': self.options[wwno.TEST][wwno.TEST_CASE_NAME][0],
             'testStatus': 'success' if wdm_stress_check else 'failure',
             'testDescription': ('Stress test passed!' if wdm_stress_check else 'Stress test failed!')
-                               + "\n" + ''.join(wdm_stress_diag_list)
+            + "\n" + ''.join(wdm_stress_diag_list)
         })
 
         # output the test result to a json file
@@ -247,39 +336,56 @@ def __process_result(self, nodeA, nodeB, value, data):
             'testResults': test_results
         }
 
-        output_file_name = self.weave_wdm.process_log_prefix + self.test_tag[1:] + TESTRAIL_SUFFIX
+        output_file_name = self.weave_wdm.process_log_prefix + \
+            self.options[wwno.TEST][wwno.TEST_TAG][1:] + TESTRAIL_SUFFIX
         self.__output_test_result(output_file_name, output_data)
 
-        self.assertTrue(wdm_stress_check, "\nwdm_stress_check is False\n\n" + "\n\t".join(stress_failures))
+        self.assertTrue(
+            wdm_stress_check,
+            "\nwdm_stress_check is False\n\n" +
+            "\n\t".join(stress_failures))
         print hgreen("Passed")
 
     def __output_test_result(self, file_path, output_data):
+        """
+        Output the test results in Testrail.
+
+        Args:
+            file_path (str): Path to testrail logs.
+            output_data (dict): Holds the test results.
+        """
         options = plugins.testrail.TestrailResultOutput.option()
-        options["quiet"] = test_option_quiet
+        options["quiet"] = self.options[wwno.TEST][wwno.QUIET]
         options["file_path"] = file_path
         options["output_data"] = output_data
 
         output_test = plugins.testrail.TestrailResultOutput.TestrailResultOutput(options)
         output_test.run()
 
+    def __run_wdm_test_between(self, nodeA, nodeB, wdm_next_args):
+        """
+        Execute the test between two nodes given test parameters.
 
-    def __run_wdm_test_between(self, nodeA, nodeB):
-        options = WeaveWdmNext.option()
-        options.update(self.default_options)
-
-        options["quiet"] = test_option_quiet
-        options["clients"] = [nodeA]
-        options["server"] = nodeB
-        options["tap"] = self.tap
-        options["wdm_option"] = self.wdm_option
+        Args:
+            nodeA (str): First node identifier.
+            nodeB (str): Second node identifier.
+            wdm_next_args (dict): Custom test parameters.
 
-        self.options = options
+        Returns:
+            (bool, list): Whether test executed without parser/leak errors and
+                          test results/logs
+        """
+        # Update default options with test parameters=
+        for category, test_param_args in wdm_next_args.items():
+            self.options[category].update(test_param_args)
 
-        self.weave_wdm = WeaveWdmNext.WeaveWdmNext(options)
+        self.options[wwno.TEST][wwno.CLIENT] = [nodeA]
+        self.options[wwno.TEST][wwno.SERVER] = nodeB
 
-        ret = self.weave_wdm.run()
+        self.weave_wdm = WeaveWdmNext.WeaveWdmNext(self.options)
 
-        value = ret.Value()
+        ret = self.weave_wdm.run_client_test()
+        success = ret.Value()
         data = ret.Data()
 
-        return value, data
+        return success, data
diff --git a/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_params.json b/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_params.json
new file mode 100644
index 0000000000..917f5d8777
--- /dev/null
+++ b/src/test-apps/happy/tests/standalone/wdmNext/weave_wdm_next_test_params.json
@@ -0,0 +1,5627 @@
+{
+    "test_weave_wdm_next_application_key_01": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_case": 2, 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_case": 2, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "B01: Stress Mutual Subscribe: Application key: Key distribution"
+            ], 
+            "test_tag": "_APPLICATION_KEY_01", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_application_key_02": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "group_enc": true, 
+            "group_enc_key_id": "0x00005536", 
+            "log_check": [
+                [
+                    "Message Encryption Key", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(1\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(1\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "B02: Stress Mutual Subscribe: Application key: Group key"
+            ], 
+            "test_tag": "_APPLICATION_KEY_02", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_resub": {
+        "client_options": {
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "enable_stop": true, 
+            "final_status": 0, 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "enable_stop": false, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "N04: Mutual Subscribe: Root path, Null Version, Resubscribe On Error"
+            ], 
+            "test_tag": "_MUTUAL_RESUB", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_01": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_01", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_02": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "save_perf": false, 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M02: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_02", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_03": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_03", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_04": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_04", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_05": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M05: Stress Mutual Subscribe: Root path. Null Version. Idle, Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_05", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_06": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_06", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_07": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M07: Stress Mutual Susbscribe: Root path. Null Version. Idle. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_07", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_08": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_08", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_09": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M09: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_09", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_10": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[ALIVE\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M10: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_10", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_11": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M11: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_11", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_12": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M12: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator.Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_12", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_13": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M13: Stress Mutual Subscribe: Root path. Null Version. Mutate data in responder. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_13", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_14": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M14: Stress Mutual Subscribe: Root path, Null Version, Notification in responder, Publisher in initiator Cancel"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_14", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_15": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M15: Stress Mutual Subscribe: Root path. Null Version. Notification in responder. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_15", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_16": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M16: Stress Mutual Subscribe: Root path. Null Version. Mutate data in responder. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_16", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_17": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M17: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_17", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_18": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M18: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_18", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_19": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M19: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_19", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_20": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M20: Stress Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_20", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_21": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "E05: Mutual Subscribe: Root path. Null Version. Client in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_21", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_22": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "E06: Mutual Subscribe: Root path. Null Version. Publisher in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_22", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_23": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "E07: Mutual Subscribe: Root path. Null Version. Client in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_23", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_24": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "E08: Mutual Subscribe: Root path. Null Version. Publisher in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_24", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_25": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F17: Mutual Subscribe: Root path. Null Version. Idle. Client in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_25", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_26": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F18: Mutual Subscribe: Root path. Null Version. Idle. Publisher in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_26", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_27": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F19: Mutual Subscribe: Root path. Null Version. Idle. Client in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_27", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_28": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F20: Mutual Subscribe: Root path. Null Version. Idle. Publisher in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_28", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_29": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F21: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_29", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_30": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F22: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_30", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_31": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F23: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Client in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_31", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_32": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F24: Mutual Subscribe: Root path. Null Version. Mutate data in initiator. Publisher in responder Abort"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_32", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_33": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F25: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Client in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_33", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_34": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F26: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Publisher in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_34", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_35": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F27: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Client in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_35", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_36": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F28: Mutual Subscribe: Root path. Null Version. Mutate data in responder. Publisher in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_36", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_37": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F29: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_37", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_38": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)]\\ EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F30: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in responder cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_38", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_39": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F31: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Client in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_39", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_40": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "F32: Mutual Subscribe: Root path. Null Version. Mutate data in initiator and responder. Publisher in responder aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_40", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_41": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    11
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110", 
+                    2
+                ], 
+                [
+                    "0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210", 
+                    1
+                ], 
+                [
+                    "0 ==> 300 ==> 301 ==> 302 ==> 303 ==> 304 ==> 305 ==> 306 ==> 307 ==> 308 ==> 309 ==> 310", 
+                    1
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "G01: Mutual Subscribe: Multiple Iterations. Mutate data in responder. Client in initiator aborts. Version is kept."
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_41", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_42": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    11
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110", 
+                    2
+                ], 
+                [
+                    "0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210", 
+                    1
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 1
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "G02: Mutual Subscribe: Multiple Iterations. Mutate data in initiator. Client in initiator aborts. Version is kept."
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_42", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_43": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    11
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110", 
+                    2
+                ], 
+                [
+                    "0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210", 
+                    1
+                ], 
+                [
+                    "0 ==> 300 ==> 301 ==> 302 ==> 303 ==> 304 ==> 305 ==> 306 ==> 307 ==> 308 ==> 309 ==> 310", 
+                    1
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    11
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110", 
+                    2
+                ], 
+                [
+                    "0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210", 
+                    1
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "G03: Mutual Subscribe: Multiple Iterations. Mutate data in initiator and responder. Client in initiator aborts. Version is kept"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_43", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_44": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 0, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M25: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_44", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_45": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M26: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in Initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_45", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_46": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M27: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_46", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_47": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[ALIVE\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M28: Stress Mutual Subscribe: Initiator Continuous Events. Mutate data in initiator. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_47", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_48": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M29: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_48", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_49": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M30: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Publisher in Initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_49", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_50": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M31: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_50", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_51": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[ALIVE\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M32: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_51", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_52": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 0, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M33: Stress Mutual Subscribe: Initiator Continuous Events. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_52", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_53": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 0, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M34: Stress Mutual Subscribe: Initiator Continuous Events. Publisher in Initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_53", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_54": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M35: Stress Mutual Subscribe: Initiator Continuous Events. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_54", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_55": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[ALIVE\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M36: Stress Mutual Subscribe: Initiator Continuous Events. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_55", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_56": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 35000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M37: Stress Mutual Subscribe: Responder Continuous Events. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_56", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_57": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M38: Stress Mutual Subscribe: Responder Continuous Events. Mutate data in responder. Publisher in Initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_57", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_58": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M39: Stress Mutual Subscribe: Responder Continuous Events. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_58", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_59": {
+        "client_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[ALIVE\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M40: Stress Mutual Subscribe: Responder Continuous Events. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_59", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_60": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 0, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M41: Initiator and Responder Continuous Events. Mutate data in initiator responder. Client in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_60", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_61": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 1, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M42: Stress Mutual Subscribe: Initiator and Responder Continuous Events. Mutate data in initiator and responder. Publisher in initiator cancels"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_61", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_62": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 2, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M43: Stress Mutual Subscribe: Initiator and Responder Continuous Events. Mutate data in initiator and responder. Client in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_62", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_63": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 3, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[ALIVE\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "M44: Stress Mutual Subscribe: Initiator and Responder Continuous Events. Mutate data in initiator and responder. Publisher in initiator aborts"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_63", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_64": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Error retrieving data from trait", 
+                    10
+                ], 
+                [
+                    "trait property is too big so that it fails to fit in the packet", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_case": 4, 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Error retrieving data from trait", 
+                    5
+                ], 
+                [
+                    "trait property is too big so that it fails to fit in the packet", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_case": 4, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "N01: Stress Mutual Subscribe: Oversize trait exists in the end of source trait list at initiator and in the beginning of source trait list at responder."
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_64", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_65": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    10
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Error retrieving data from trait", 
+                    10
+                ], 
+                [
+                    "trait property is too big so that it fails to fit in the packet", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_case": 5, 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "bound mutual subscription is going away", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ], 
+                [
+                    "Error retrieving data from trait", 
+                    10
+                ], 
+                [
+                    "trait property is too big so that it fails to fit in the packet", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_case": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "N02: Stress Mutual Subscribe: Oversize trait exists in the end of source trait list at initiator and in the middle of source trait list at responder."
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_65", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_mutual_subscribe_faults": {
+        "client_options": {
+            "enable_flip": 1, 
+            "event_generator": "Liveness", 
+            "final_status": 0, 
+            "inter_event_period": 9000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "bound mutual subscription is going away", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    4
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "Mutual subscription happy sequence for fault-injection"
+            ], 
+            "test_tag": "_MUTUAL_SUBSCRIBE_FAULTS", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_01": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L01: Stress One way Subscribe: Root path. Null Version. Client cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_01", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_02": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L02: Stress One way Subscribe: Root path. Null Version. Client aborts"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_02", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_03": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[(CANCL)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L03: Stress One way Subscribe: Root path. Null Version. Idle. Client cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_03", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_04": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L04: Stress One way Subscribe: Root path. Null Version. Idle. Client aborts"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_04", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_05": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L05: Stress One way Subscribe: Root path, Null Version. Mutate data in Publisher. Client cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_05", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_06": {
+        "client_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[ALIVE\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    15
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": true, 
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L06: Stress One way Subscribe: Root path. Null Version. Mutate data in Publisher. Client aborts"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_06", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_07": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 0, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "B03: One way Subscribe: Root path. Null Version. Publisher cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_07", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_08": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "B04: One way Subscribe: Root path. Null Version. Publisher aborts"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_08", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_09": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 10000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "C05: One way Subscribe: Root path. Null Version. Idle. Publisher cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_09", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_10": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "C06: One way Subscribe: Root path, Null Version, Idle, Publisher Abort"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_10", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_11": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 1, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "C07: One way Subscribe: Root path. Null Version. Mutate data in publisher. Publisher cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_11", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_12": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    3
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "test_delay": 15000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 3, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    1
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    1
+                ]
+            ], 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "C08: One way Subscribe: Root path. Null Version. Mutate data in publisher. Publisher aborts"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_12", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_13": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client->kEvent_OnNotificationProcessed", 
+                    11
+                ], 
+                [
+                    "0 ==> 100 ==> 101 ==> 102 ==> 103 ==> 104 ==> 105 ==> 106 ==> 107 ==> 108 ==> 109 ==> 110", 
+                    2
+                ], 
+                [
+                    "0 ==> 200 ==> 201 ==> 202 ==> 203 ==> 204 ==> 205 ==> 206 ==> 207 ==> 208 ==> 209 ==> 210", 
+                    1
+                ], 
+                [
+                    "0 ==> 300 ==> 301 ==> 302 ==> 303 ==> 304 ==> 305 ==> 306 ==> 307 ==> 308 ==> 309 ==> 310", 
+                    1
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 5000, 
+            "total_count": 2
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] TimerEventHandler Ref\\(\\d+\\) Timeout", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "timer_period": 4000, 
+            "total_count": 2
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "D01: One way Subscribe: Multiple Iterations. Mutate data in publisher. Client aborts. Version is kept"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_13", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_14": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[CANCL\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 0, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L07: Stress One way Subscribe: Publisher Continuous Events. Publisher mutates trait data. Client cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_14", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_15": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 0, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L08: Stress One way Subscribe: Publisher Continuous Events. Publisher mutates trait data. Client aborts"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_15", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_16": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] EndSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] \\[CANCL\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 2000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] CancelRequestHandler", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 0, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L09: Stress One way Subscribe: Publisher Continuous Events. Client cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_16", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_one_way_subscribe_17": {
+        "client_options": {
+            "enable_flip": 0, 
+            "final_status": 2, 
+            "log_check": [
+                [
+                    "Client\\[0\\] \\[(ALIVE|CONFM)\\] _AbortSubscription Ref\\(\\d+\\)", 
+                    5
+                ], 
+                [
+                    "Client\\[0\\] moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 35000, 
+            "test_iterations": 5, 
+            "timer_period": 16000, 
+            "total_count": 4
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "event_generator": "Security", 
+            "final_status": 4, 
+            "inter_event_period": 2000, 
+            "log_check": [
+                [
+                    "Handler\\[0\\] \\[(ALIVE|CONFM)\\] HandleSubscriptionTerminated", 
+                    5
+                ], 
+                [
+                    "Handler\\[0\\] Moving to \\[ FREE\\] Ref\\(0\\)", 
+                    5
+                ]
+            ], 
+            "test_delay": 0, 
+            "timer_period": 15000, 
+            "total_count": 4
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "L10: Stress One way Subscribe: Publisher Continuous Events. Client cancels"
+            ], 
+            "test_tag": "_ONE_WAY_SUBSCRIBE_17", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_oneway_resub": {
+        "client_options": {
+            "enable_flip": 0, 
+            "enable_retry": true, 
+            "enable_stop": true, 
+            "final_status": 0, 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "enable_stop": false, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "N03: One way Subscribe: Root path, Null Version, Resubscribe On Error"
+            ], 
+            "test_tag": "_ONEWAY_RESUB", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_oneway_subscribe_faults": {
+        "client_options": {
+            "enable_flip": 1, 
+            "final_status": 0, 
+            "log_check": [], 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 3000, 
+            "total_count": 1
+        }, 
+        "server_options": {
+            "enable_flip": 1, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_delay": 0, 
+            "timer_period": 2000, 
+            "total_count": 1
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "One way subscription happy sequence for fault injection"
+            ], 
+            "test_tag": "_ONEWAY_SUBSCRIBE_FAULTS", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_subless_notify_01": {
+        "client_options": {
+            "final_status": 0, 
+            "log_check": [], 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "server_options": {
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_delay": 1000, 
+            "test_iterations": 1, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "O01: Subscriptionless Notify: Publisher sends subscriptionless notify to receiver, and receiver notifies application after processing trait data"
+            ], 
+            "test_tag": "_SUBLESS_NOTIFY_01", 
+            "timeout": 10, 
+            "wdm_option": "subless_notify"
+        }
+    }, 
+    "test_weave_wdm_next_update_01": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Update: path result: success", 
+                    1
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 10000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Conditional", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_timing": "AfterSub"
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_case": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "Update 01: Client creates mutual subscription, sends conditional update request to publisher, and receives notification and status report"
+            ], 
+            "test_tag": "_UPDATE_01", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_update_02": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Update: path result: success", 
+                    1
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 10000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Unconditional", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_timing": "AfterSub"
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_case": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "Update 02: Client creates mutual subscription, sends unconditional update request to publisher, and receives notification and status report"
+            ], 
+            "test_tag": "_UPDATE_02", 
+            "wdm_option": "mutual_subscribe"
+        }
+    }, 
+    "test_weave_wdm_next_update_03": {
+        "client_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 1, 
+            "enable_retry": true, 
+            "final_status": 0, 
+            "log_check": [
+                [
+                    "Update: path result: success", 
+                    1
+                ]
+            ], 
+            "test_case": 10, 
+            "test_delay": 2000, 
+            "test_iterations": 1, 
+            "timer_period": 10000, 
+            "total_count": 1, 
+            "wdm_update_conditionality": "Unconditional", 
+            "wdm_update_mutation": "OneLeaf", 
+            "wdm_update_number_of_mutations": 1, 
+            "wdm_update_timing": "NoSub"
+        }, 
+        "server_options": {
+            "clear_state_between_iterations": false, 
+            "enable_flip": 0, 
+            "final_status": 4, 
+            "log_check": [], 
+            "test_case": 10, 
+            "timer_period": 0, 
+            "total_count": 0
+        }, 
+        "test_options": {
+            "test_case_name": [
+                "Update 03: Client sends standalone unconditional update request to publisher, and receives status report"
+            ], 
+            "test_tag": "_UPDATE_03", 
+            "wdm_option": "one_way_subscribe"
+        }
+    }
+}