5.1.0 policy-handler - policy-updates from new PDP5.1.0

DCAEGEN2-1851:
- policy-handler now supports the policy-update notification
  from the new policy-engine thru DMaaP MR
  = no policy-filters - only policy-id values
- see README for discoverable config settings of dmaap_mr client
  = DMaaP MR client has the same flexibility as policy_engine
  = set the query.timeout to high value like 15000 (default)
- requests to DMaaP MR go through a single blocking connection
- first catch-up only after draining the policy-updates from DMaaP MR
  on the first loop
- safe parsing of messages from DMaaP MR
- policy-engine changed the data type for policy-version field
  from int to string that is expected to have the semver value
- related change to deployment-handler (DCAEGEN2-2085) has to be
  deployed to handle the non-numeric policyVersion
- on new PDP API: http /policy_latest and policy-updates
  return the new data from the new PDP API with the following fields
  added/renamed by the policy-handler to keep other policy related parts
  intact in R4-R6 (see pdp_api/policy_utils.py)
  * policyName = policy_id + "." + policyVersion.replace(".","-")
                                 + ".xml"
  * policyVersion = str(metadata["policy-version"])
  * "config" - is the renamed "properties" from the new PDP API response
- enabled the /catch_up and the periodic auto-catch-up for the new PDP
  API
- enabled GET /policies_latest - returns the latest policies for the
  deployed components
- POST /policies_latest - still disabled since no support for the
  policy-filters is provided for the new PDP API
- fixed hiding the Authorization value on comparing the configs
- logging of secrets is now sha256 to see whether they changed
- added X-ONAP-RequestID to headers the same way as X-ECOMP-RequestID
- on policy-update process the removal first, then addition
- changed the pool_connections=1 (number of pools) on PDP and DH sides
  == only a single destination is expected for each
- log the exception as fatal into error.log
- other minor fixes and refactoring
- unit-test coverage 74%
- integration testing is requested

DCAEGEN2-1976:
- policy-handler is enhanced to get user/password from env vars
  for PDP and DMaaP MR clients and overwriting the Authorization field
  in https headers received from the discoverable config
  = to override the Authorization value on policy_engine,
    set the environment vars $PDP_USER and $PDP_PWD in policy-handler
    container
  = to override the Authorization value on dmaap_mr,
    if using https and user-password authentication,
    set the environment vars $DMAAP_MR_USER and $DMAAP_MR_PWD in
    policy-handler container

Change-Id: Iad8eab9e20e615a0e0d2822f4735dc64c50aa55c
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-1851
Issue-ID: DCAEGEN2-1976

21 files changed, 3814 insertions, 1107 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index c3f4100..cbd6264 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,30 +15,27 @@
 # ============LICENSE_END=========================================================
 #
 """
-startdard pytest file that contains the shared fixtures
+standard pytest file that contains the shared fixtures
 https://docs.pytest.org/en/latest/fixture.html
 """
 import base64
 import copy
 import json
+import os
 
 import pytest
 
 from policyhandler.config import Config
-from policyhandler.deploy_handler import DeployHandler
 from policyhandler.discovery import DiscoveryClient
-from policyhandler.onap.audit import Audit
 from policyhandler.policy_consts import CATCH_UP, TARGET_ENTITY
 from policyhandler.utils import Utils
 
-from .mock_deploy_handler import MockDeploymentHandler
 from .mock_settings import MockSettings
 from .mock_tracker import MockHttpResponse, Tracker
 
 _LOGGER = Utils.get_logger(__file__)
 
-_LOGGER.info("init MockSettings")
-MockSettings.init()
+MockSettings.init_mock_config()
 
 @pytest.fixture(scope="session", autouse=True)
 def _auto_setup__global():
@@ -50,9 +47,19 @@ def _auto_setup__global():
     _LOGGER.info("teardown _auto_setup__global")
 
 
+@pytest.fixture(autouse=True, scope="module")
+def _auto_module_cycle(request):
+    """log all the test starts and ends"""
+    module_name = request.module.__name__.replace(".", "/")
+
+    _LOGGER.info("start_module: %s %s", module_name, "->"*25)
+    yield _auto_module_cycle
+    _LOGGER.info("end_module: %s %s", module_name, "<-"*25)
+
 @pytest.fixture(autouse=True)
 def _auto_test_cycle(request):
     """log all the test starts and ends"""
+    _LOGGER.info("-"*75)
     module_name = request.module.__name__.replace(".", "/")
     if request.cls:
         test_name = "%s.py::%s::%s" % (module_name, request.cls.__name__,
@@ -61,7 +68,6 @@ def _auto_test_cycle(request):
         test_name = "%s.py::%s" % (module_name, request.function.__name__)
 
     Tracker.reset(test_name)
-    _LOGGER.info("-"*75)
     _LOGGER.info(">>>>>>> start [%s]: %s", len(Tracker.test_names), test_name)
     yield _auto_test_cycle
     _LOGGER.info(">>>>>>> tracked messages: %s", Tracker.to_string())
@@ -84,35 +90,6 @@ def fix_cherrypy_engine_exit(monkeypatch):
     _LOGGER.info("teardown fix_cherrypy_engine_exit")
 
 
-@pytest.fixture()
-def fix_deploy_handler(monkeypatch):
-    """monkeyed requests to deployment-handler"""
-    def monkeyed_deploy_handler_put(uri, **kwargs):
-        """monkeypatch for policy-update request.put to deploy_handler"""
-        return MockHttpResponse("put", uri, MockDeploymentHandler.default_response(),
-                                **kwargs)
-
-    def monkeyed_deploy_handler_get(uri, **kwargs):
-        """monkeypatch policy-update request.get to deploy_handler"""
-        return MockHttpResponse("get", uri, MockDeploymentHandler.get_deployed_policies(),
-                                **kwargs)
-
-    _LOGGER.info("setup fix_deploy_handler")
-    audit = None
-    if DeployHandler._lazy_inited is False:
-        audit = Audit(req_message="fix_deploy_handler")
-        DeployHandler._lazy_init(audit)
-
-    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
-                        monkeyed_deploy_handler_put)
-    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
-                        monkeyed_deploy_handler_get)
-
-    yield fix_deploy_handler
-    if audit:
-        audit.audit_done("teardown")
-    _LOGGER.info("teardown fix_deploy_handler")
-
 
 @pytest.fixture()
 def fix_discovery(monkeypatch):
@@ -134,7 +111,7 @@ def fix_discovery(monkeypatch):
                 Config.consul_url, Config.system_name):
             res_json = [{"Value": base64.b64encode(
                 json.dumps(MockSettings.mock_config).encode()).decode("utf-8")}]
-        return MockHttpResponse("get", uri, res_json)
+        return MockHttpResponse("get", uri, res_json=res_json)
 
     _LOGGER.info("setup fix_discovery")
     monkeypatch.setattr('policyhandler.discovery.requests.get', monkeyed_discovery)
@@ -156,65 +133,42 @@ def fix_auto_catch_up():
     MockSettings.rediscover_config(prev_config)
     _LOGGER.info("teardown fix_auto_catch_up")
 
+@pytest.fixture(scope="module")
+def fix_pdp_authorization():
+    """set env vars that overwrite the headers.Authorization on pdp and dmaap_mr clients"""
+    _LOGGER.info("setup fix_pdp_authorization %s", json.dumps(MockSettings.mock_config))
+    prev_config = copy.deepcopy(MockSettings.mock_config)
+
+    os.environ.update({
+        Config.PDP_USER: "alex-PDP_USER",
+        Config.PDP_PWD: "alex-PDP_PWD",
+        Config.DMAAP_MR_USER: "alex-DMAAP_MR_USER",
+        Config.DMAAP_MR_PWD: "alex-DMAAP_MR_PWD"
+    })
+    Config._local_config._config = None
+    Config._pdp_authorization = None
+    Config._dmaap_mr_authorization = None
+    MockSettings.reinit_mock_config()
+    MockSettings.rediscover_config()
 
-@pytest.fixture()
-def fix_deploy_handler_413(monkeypatch):
-    """monkeyed failed discovery request.get"""
-    def monkeyed_deploy_handler_put(uri, **kwargs):
-        """monkeypatch for deploy_handler"""
-        return MockHttpResponse(
-            "put", uri,
-            {"server_instance_uuid": MockSettings.deploy_handler_instance_uuid},
-            status_code=413, **kwargs
-        )
-
-    def monkeyed_deploy_handler_get(uri, **kwargs):
-        """monkeypatch policy-update request.get to deploy_handler"""
-        return MockHttpResponse("get", uri, MockDeploymentHandler.get_deployed_policies(),
-                                **kwargs)
-
-    _LOGGER.info("setup fix_deploy_handler_413")
-    audit = None
-    if DeployHandler._lazy_inited is False:
-        audit = Audit(req_message="fix_deploy_handler_413")
-        DeployHandler._lazy_init(audit)
-
-    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
-                        monkeyed_deploy_handler_put)
-    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
-                        monkeyed_deploy_handler_get)
-
-    yield fix_deploy_handler_413
-    if audit:
-        audit.audit_done("teardown")
-    _LOGGER.info("teardown fix_deploy_handler_413")
+    _LOGGER.info("fix_pdp_authorization %s, %s: %s:%s %s:%s",
+                 json.dumps(Config._pdp_authorization), json.dumps(Config._dmaap_mr_authorization),
+                 os.environ.get(Config.PDP_USER), os.environ.get(Config.PDP_PWD),
+                 os.environ.get(Config.DMAAP_MR_USER), os.environ.get(Config.DMAAP_MR_PWD))
 
+    yield fix_pdp_authorization
 
-@pytest.fixture()
-def fix_deploy_handler_404(monkeypatch):
-    """monkeyed failed discovery request.get"""
-    def monkeyed_deploy_handler_put(uri, **kwargs):
-        """monkeypatch for deploy_handler"""
-        return MockHttpResponse("put", uri, MockDeploymentHandler.default_response(),
-                                **kwargs)
-
-    def monkeyed_deploy_handler_get(uri, **kwargs):
-        """monkeypatch policy-update request.get to deploy_handler"""
-        return MockHttpResponse("get", uri, MockDeploymentHandler.default_response(),
-                                **kwargs)
-
-    _LOGGER.info("setup fix_deploy_handler_404")
-    audit = None
-    if DeployHandler._lazy_inited is False:
-        audit = Audit(req_message="fix_deploy_handler_404")
-        DeployHandler._lazy_init(audit)
-
-    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
-                        monkeyed_deploy_handler_put)
-    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
-                        monkeyed_deploy_handler_get)
-
-    yield fix_deploy_handler_404
-    if audit:
-        audit.audit_done("teardown")
-    _LOGGER.info("teardown fix_deploy_handler_404")
+    del os.environ[Config.PDP_USER]
+    del os.environ[Config.PDP_PWD]
+    del os.environ[Config.DMAAP_MR_USER]
+    del os.environ[Config.DMAAP_MR_PWD]
+
+    Config._local_config._config = None
+    Config._pdp_authorization = None
+    Config._dmaap_mr_authorization = None
+    MockSettings.reinit_mock_config()
+    MockSettings.rediscover_config(prev_config)
+    _LOGGER.info("teardown fix_pdp_authorization %s, %s: %s:%s %s:%s",
+                 json.dumps(Config._pdp_authorization), json.dumps(Config._dmaap_mr_authorization),
+                 os.environ.get(Config.PDP_USER), os.environ.get(Config.PDP_PWD),
+                 os.environ.get(Config.DMAAP_MR_USER), os.environ.get(Config.DMAAP_MR_PWD))
diff --git a/tests/etc_config.json b/tests/etc_config.json
index d7715b2..c5df55c 100644
--- a/tests/etc_config.json
+++ b/tests/etc_config.json
@@ -7,7 +7,7 @@
         "system" : "policy_handler",
         "tls" : {
             "cert_directory" : "etc/tls/certs/",
-            "cacert" : "att_internal_root.crt",
+            "cacert" : "cacert.crt",
             "private_key" : "key.pem",
             "server_cert" : "cert.pem",
             "server_ca_chain" : "ca_chain.pem"
diff --git a/tests/main/conftest.py b/tests/main/conftest.py
index c985380..11f5d0b 100644
--- a/tests/main/conftest.py
+++ b/tests/main/conftest.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,42 +15,87 @@
 # ============LICENSE_END=========================================================
 #
 """
-startdard pytest file that contains the shared fixtures
+standard pytest file that contains the shared fixtures
 https://docs.pytest.org/en/latest/fixture.html
 """
 
-import pytest
+import time
 
+import pytest
 from policyhandler import pdp_client
-from policyhandler.pdp_api.pdp_consts import PDP_POLICY_ID, PDP_REQ_RESOURCE
+from policyhandler.deploy_handler import DeployHandler
+from policyhandler.onap.audit import Audit
+from policyhandler.pdp_api.dmaap_mr import DmaapMr
 from policyhandler.utils import Utils
 
 from ..mock_tracker import MockHttpResponse
-from .mock_policy_engine import MockPolicyEngine
 
 _LOGGER = Utils.get_logger(__file__)
 
-@pytest.fixture(scope="session", autouse=True)
-def _auto_setup_policy_engine():
-    """initialize the mock-policy-engine per the whole test session"""
-    _LOGGER.info("create _auto_setup_policy_engine")
-    MockPolicyEngine.init()
-    yield _auto_setup_policy_engine
-    _LOGGER.info("teardown _auto_setup_policy_engine")
-
 @pytest.fixture()
 def fix_pdp_post(monkeypatch):
     """monkeyed request /decision/v1 to PDP"""
     def monkeyed_policy_rest_post(uri, json=None, **kwargs):
         """monkeypatch for the POST to policy-engine"""
-        policy_ids = json.get(PDP_REQ_RESOURCE, {}).get(PDP_POLICY_ID)
-        policy_id = policy_ids and policy_ids[0]
-        res_json = MockPolicyEngine.get_policy(policy_id)
-        return MockHttpResponse("post", uri, res_json, json=json, **kwargs)
+        return MockHttpResponse("post", uri, json=json, **kwargs)
 
     _LOGGER.info("setup fix_pdp_post")
+    pdp_client.PolicyRest._lazy_inited = False
     pdp_client.PolicyRest._lazy_init()
     monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post',
                         monkeyed_policy_rest_post)
     yield fix_pdp_post
     _LOGGER.info("teardown fix_pdp_post")
+
+@pytest.fixture()
+def fix_deploy_handler(monkeypatch):
+    """monkeyed requests to deployment-handler"""
+    def monkeyed_deploy_handler_put(uri, **kwargs):
+        """monkeypatch for policy-update request.put to deploy_handler"""
+        return MockHttpResponse("put", uri, **kwargs)
+
+    def monkeyed_deploy_handler_get(uri, **kwargs):
+        """monkeypatch policy-update request.get to deploy_handler"""
+        return MockHttpResponse("get", uri, **kwargs)
+
+    _LOGGER.info("setup fix_deploy_handler")
+    audit = None
+    if DeployHandler._lazy_inited is False:
+        audit = Audit(req_message="fix_deploy_handler")
+        DeployHandler._lazy_init(audit)
+
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
+                        monkeyed_deploy_handler_put)
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
+                        monkeyed_deploy_handler_get)
+
+    yield fix_deploy_handler
+    if audit:
+        audit.audit_done("teardown")
+    _LOGGER.info("teardown fix_deploy_handler")
+
+@pytest.fixture()
+def fix_dmaap_mr(monkeypatch):
+    """monkeyed requests to dmaap_mr"""
+    def monkeyed_dmaap_mr_get(uri, **kwargs):
+        """monkeypatch policy-update request.get to dmaap_mr"""
+        if kwargs.get("params"):
+            _LOGGER.info("--- fix_dmaap_mr --- sleeping 3 secs...")
+            time.sleep(3)
+        else:
+            _LOGGER.info("--- fix_dmaap_mr --- sleeping 0.5 secs...")
+            time.sleep(0.5)
+        _LOGGER.info("--- fix_dmaap_mr --- send back the response")
+        return MockHttpResponse("get", uri, **kwargs)
+
+    _LOGGER.info("setup fix_dmaap_mr")
+    audit = Audit(req_message="fix_dmaap_mr")
+    DmaapMr._lazy_inited = False
+    DmaapMr._lazy_init(audit)
+
+    monkeypatch.setattr('policyhandler.pdp_api.dmaap_mr.DmaapMr._requests_session.get',
+                        monkeyed_dmaap_mr_get)
+
+    yield fix_dmaap_mr
+    audit.audit_done("teardown")
+    _LOGGER.info("teardown fix_dmaap_mr")
diff --git a/tests/main/expectations.json b/tests/main/expectations.json
new file mode 100644
index 0000000..4f93930
--- /dev/null
+++ b/tests/main/expectations.json
@@ -0,0 +1,2839 @@
+{
+    "tests/main/test_policyhandler.py::WebServerTest::test_web_all_policies_latest": [
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "0": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "3": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem",
+                            "test_scope_prefix.pdp_decision_amet",
+                            "test_scope_prefix.pdp_decision_ametist",
+                            "test_scope_prefix.pdp_decision_consectetur",
+                            "test_scope_prefix.pdp_decision_dolor",
+                            "test_scope_prefix.pdp_decision_ipsum",
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_amet",
+                            "policy-id": "test_scope_prefix.pdp_decision_amet",
+                            "policy-version": "5.5.5"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 4,
+                            "policy_updated_to_ver": 5,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_amet"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ametist",
+                            "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                            "policy-version": "7.7.7"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 6,
+                            "policy_updated_to_ver": 7,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                            "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                            "policy-version": "6.6.6"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 5,
+                            "policy_updated_to_ver": 6,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_dolor",
+                            "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                            "policy-version": "3.3.3"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 2,
+                            "policy_updated_to_ver": 3,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                            "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                            "policy-version": "2.2.2"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 1,
+                            "policy_updated_to_ver": 2,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        }
+    ],
+    "tests/main/test_policyhandler.py::WebServerTest::test_web_policies_latest": [
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": {
+                    "policyName": "test_scope_prefix.Config_amet.*"
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": "*",
+            "status_code": 200
+        }
+    ],
+    "tests/main/test_policyhandler.py::WebServerTest::test_web_policy_latest": [
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        }
+    ],
+    "tests/main/test_policyhandler.py::WebServerTest::test_zzzzz_shutdown": [
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": null,
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": ["garbage-to-be-ignored"],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "0": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "3": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem",
+                            "test_scope_prefix.pdp_decision_amet",
+                            "test_scope_prefix.pdp_decision_ametist",
+                            "test_scope_prefix.pdp_decision_consectetur",
+                            "test_scope_prefix.pdp_decision_dolor",
+                            "test_scope_prefix.pdp_decision_ipsum",
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_amet",
+                            "policy-id": "test_scope_prefix.pdp_decision_amet",
+                            "policy-version": "5.5.5"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 4,
+                            "policy_updated_to_ver": 5,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_amet"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ametist",
+                            "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                            "policy-version": "7.7.7"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 6,
+                            "policy_updated_to_ver": 7,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                            "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                            "policy-version": "6.6.6"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 5,
+                            "policy_updated_to_ver": 6,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_dolor",
+                            "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                            "policy-version": "3.3.3"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 2,
+                            "policy_updated_to_ver": 3,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                            "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                            "policy-version": "2.2.2"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 1,
+                            "policy_updated_to_ver": 2,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": true,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 0,
+                                    "policy_updated_to_ver": 1,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1.xml",
+                                "policyVersion": "1.1.1",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "test_scope_prefix.pdp_decision_ametist": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 6,
+                                    "policy_updated_to_ver": 7,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ametist",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                                    "policy-version": "7.7.7"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ametist.7-7-7.xml",
+                                "policyVersion": "7.7.7",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "test_scope_prefix.pdp_decision_consectetur": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 5,
+                                    "policy_updated_to_ver": 6,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-version": "6.6.6"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_consectetur.6-6-6.xml",
+                                "policyVersion": "6.6.6",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "test_scope_prefix.pdp_decision_dolor": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 2,
+                                    "policy_updated_to_ver": 3,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_dolor",
+                                    "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                                    "policy-version": "3.3.3"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_dolor.3-3-3.xml",
+                                "policyVersion": "3.3.3",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "test_scope_prefix.pdp_decision_ipsum": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 1,
+                                    "policy_updated_to_ver": 2,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-version": "2.2.2"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ipsum.2-2-2.xml",
+                                "policyVersion": "2.2.2",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "test_scope_prefix.pdp_decision_sit": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 3,
+                                    "policy_updated_to_ver": 4,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_sit",
+                                    "policy-id": "test_scope_prefix.pdp_decision_sit",
+                                    "policy-version": "4.4.4"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_sit.4-4-4.xml",
+                                "policyVersion": "4.4.4",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_sit"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        }
+    ],
+    "tests/main/test_policyhandler.py::WebServerTest::test_zzz_policy_updates_and_catch_ups": [
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": null,
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": ["garbage-to-be-ignored"],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "0": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "3": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem",
+                            "test_scope_prefix.pdp_decision_amet",
+                            "test_scope_prefix.pdp_decision_ametist",
+                            "test_scope_prefix.pdp_decision_consectetur",
+                            "test_scope_prefix.pdp_decision_dolor",
+                            "test_scope_prefix.pdp_decision_ipsum",
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_amet",
+                            "policy-id": "test_scope_prefix.pdp_decision_amet",
+                            "policy-version": "5.5.5"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 4,
+                            "policy_updated_to_ver": 5,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_amet"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ametist",
+                            "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                            "policy-version": "7.7.7"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 6,
+                            "policy_updated_to_ver": 7,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                            "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                            "policy-version": "6.6.6"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 5,
+                            "policy_updated_to_ver": 6,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_dolor",
+                            "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                            "policy-version": "3.3.3"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 2,
+                            "policy_updated_to_ver": 3,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                            "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                            "policy-version": "2.2.2"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 1,
+                            "policy_updated_to_ver": 2,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": true,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 0,
+                                    "policy_updated_to_ver": 1,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1.xml",
+                                "policyVersion": "1.1.1",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "test_scope_prefix.pdp_decision_ametist": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 6,
+                                    "policy_updated_to_ver": 7,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ametist",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                                    "policy-version": "7.7.7"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ametist.7-7-7.xml",
+                                "policyVersion": "7.7.7",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "test_scope_prefix.pdp_decision_consectetur": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 5,
+                                    "policy_updated_to_ver": 6,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-version": "6.6.6"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_consectetur.6-6-6.xml",
+                                "policyVersion": "6.6.6",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "test_scope_prefix.pdp_decision_dolor": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 2,
+                                    "policy_updated_to_ver": 3,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_dolor",
+                                    "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                                    "policy-version": "3.3.3"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_dolor.3-3-3.xml",
+                                "policyVersion": "3.3.3",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "test_scope_prefix.pdp_decision_ipsum": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 1,
+                                    "policy_updated_to_ver": 2,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-version": "2.2.2"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ipsum.2-2-2.xml",
+                                "policyVersion": "2.2.2",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "test_scope_prefix.pdp_decision_sit": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 3,
+                                    "policy_updated_to_ver": 4,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_sit",
+                                    "policy-id": "test_scope_prefix.pdp_decision_sit",
+                                    "policy-version": "4.4.4"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_sit.4-4-4.xml",
+                                "policyVersion": "4.4.4",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_sit"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+            },
+            "res": [
+                "{\"deployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1-update1\",\"success-count\":3,\"failure-count\":0}],\"undeployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1\",\"success-count\":3,\"failure-count\":0}]}"
+            ],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "1.1.1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "7.7.7": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "6.6.6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "3.3.3": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "2.2.2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "4.4.4": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1-update1"
+                        },
+                        "properties": {
+                            "policy_hello": "world! - updated 1",
+                            "policy_updated_from_ver": "1.1.1",
+                            "policy_updated_to_ver": "1.1.1-update1",
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": false,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world! - updated 1",
+                                    "policy_updated_from_ver": "1.1.1",
+                                    "policy_updated_to_ver": "1.1.1-update1",
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1-update1"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1-update1.xml",
+                                "policyVersion": "1.1.1-update1",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [
+                "{\"deployed-policies\":[{\"policy-type\":\"onap.policies.testing\",\"policy-type-version\":\"99.0.0\",\"policy-id\":\"not-dcae.expect-be-ignored-55\",\"policy-version\":\"522.522.522\",\"success-count\":3,\"failure-count\":0}],\"undeployed-policies\":[{\"policy-type\":\"onap.policies.testing\",\"policy-type-version\":\"9.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_ipsum\",\"policy-version\":\"2.2.2\",\"success-count\":3,\"failure-count\":0},{\"policy-type\":\"onap.policies.testing\",\"policy-type-version\":\"9.0.0\",\"policy-id\":\"not-dcae.expect-be-ignored\",\"policy-version\":\"22.22.22\",\"success-count\":3,\"failure-count\":0}]}",
+                "{\"deployed-policies\":[{\"policy-type\":\"onap.policies.testing\",\"policy-type-version\":\"99.9.9\",\"policy-id\":\"not-dcae.expect-be-ignored-55\",\"policy-version\":\"5522.5522.522\",\"success-count\":3,\"failure-count\":0}],\"undeployed-policies\":[{\"policy-type\":\"onap.policies.testing\",\"policy-type-version\":\"9.0.0\",\"policy-id\":\"not-dcae.expect-be-ignored\",\"policy-version\":\"22.22.22\",\"success-count\":3,\"failure-count\":0}]}"
+            ],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "1.1.1-update1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "7.7.7": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "6.6.6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "3.3.3": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "2.2.2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "4.4.4": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_ipsum"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {}
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": false,
+                    "latest_policies": {},
+                    "policy_filter_matches": {},
+                    "removed_policies": {
+                        "test_scope_prefix.pdp_decision_ipsum": true
+                    }
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [
+                "{\"deployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1-update1\",\"success-count\":3,\"failure-count\":0}],\"undeployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1\",\"success-count\":3,\"failure-count\":0}]}",
+                "{\"deployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1-update2\",\"success-count\":3,\"failure-count\":0}],\"undeployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1-update1\",\"success-count\":3,\"failure-count\":0}]}",
+                "{\"deployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1-update3\",\"success-count\":3,\"failure-count\":0}],\"undeployed-policies\":[{\"policy-type\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\",\"policy-type-version\":\"1.0.0\",\"policy-id\":\"test_scope_prefix.pdp_decision_Lorem\",\"policy-version\":\"1.1.1-update2\",\"success-count\":3,\"failure-count\":0}]}"
+            ],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "1.1.1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "7.7.7": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "6.6.6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "3.3.3": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "2.2.2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "4.4.4": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1-update3"
+                        },
+                        "properties": {
+                            "policy_hello": "world! - updated 3",
+                            "policy_updated_from_ver": "1.1.1-update2",
+                            "policy_updated_to_ver": "1.1.1-update3",
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": false,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world! - updated 3",
+                                    "policy_updated_from_ver": "1.1.1-update2",
+                                    "policy_updated_to_ver": "1.1.1-update3",
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1-update3"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1-update3.xml",
+                                "policyVersion": "1.1.1-update3",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic auth",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        }
+    ],
+    "tests/main/test_pz_catch_up.py::test_catch_up": [
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic YWxleC1ETUFBUF9NUl9VU0VSOmFsZXgtRE1BQVBfTVJfUFdE",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": null,
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": ["garbage-to-be-ignored"],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "0": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "3": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic YWxleC1QRFBfVVNFUjphbGV4LVBEUF9QV0Q=",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem",
+                            "test_scope_prefix.pdp_decision_amet",
+                            "test_scope_prefix.pdp_decision_ametist",
+                            "test_scope_prefix.pdp_decision_consectetur",
+                            "test_scope_prefix.pdp_decision_dolor",
+                            "test_scope_prefix.pdp_decision_ipsum",
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_amet",
+                            "policy-id": "test_scope_prefix.pdp_decision_amet",
+                            "policy-version": "5.5.5"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 4,
+                            "policy_updated_to_ver": 5,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_amet"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ametist",
+                            "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                            "policy-version": "7.7.7"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 6,
+                            "policy_updated_to_ver": 7,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                            "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                            "policy-version": "6.6.6"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 5,
+                            "policy_updated_to_ver": 6,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_dolor",
+                            "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                            "policy-version": "3.3.3"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 2,
+                            "policy_updated_to_ver": 3,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                            "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                            "policy-version": "2.2.2"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 1,
+                            "policy_updated_to_ver": 2,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": true,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 0,
+                                    "policy_updated_to_ver": 1,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1.xml",
+                                "policyVersion": "1.1.1",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "test_scope_prefix.pdp_decision_ametist": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 6,
+                                    "policy_updated_to_ver": 7,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ametist",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                                    "policy-version": "7.7.7"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ametist.7-7-7.xml",
+                                "policyVersion": "7.7.7",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "test_scope_prefix.pdp_decision_consectetur": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 5,
+                                    "policy_updated_to_ver": 6,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-version": "6.6.6"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_consectetur.6-6-6.xml",
+                                "policyVersion": "6.6.6",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "test_scope_prefix.pdp_decision_dolor": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 2,
+                                    "policy_updated_to_ver": 3,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_dolor",
+                                    "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                                    "policy-version": "3.3.3"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_dolor.3-3-3.xml",
+                                "policyVersion": "3.3.3",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "test_scope_prefix.pdp_decision_ipsum": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 1,
+                                    "policy_updated_to_ver": 2,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-version": "2.2.2"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ipsum.2-2-2.xml",
+                                "policyVersion": "2.2.2",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "test_scope_prefix.pdp_decision_sit": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 3,
+                                    "policy_updated_to_ver": 4,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_sit",
+                                    "policy-id": "test_scope_prefix.pdp_decision_sit",
+                                    "policy-version": "4.4.4"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_sit.4-4-4.xml",
+                                "policyVersion": "4.4.4",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_sit"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic YWxleC1ETUFBUF9NUl9VU0VSOmFsZXgtRE1BQVBfTVJfUFdE",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+            },
+            "res": [],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "0": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "3": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic YWxleC1QRFBfVVNFUjphbGV4LVBEUF9QV0Q=",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem",
+                            "test_scope_prefix.pdp_decision_amet",
+                            "test_scope_prefix.pdp_decision_ametist",
+                            "test_scope_prefix.pdp_decision_consectetur",
+                            "test_scope_prefix.pdp_decision_dolor",
+                            "test_scope_prefix.pdp_decision_ipsum",
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_amet",
+                            "policy-id": "test_scope_prefix.pdp_decision_amet",
+                            "policy-version": "5.5.5"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 4,
+                            "policy_updated_to_ver": 5,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_amet"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ametist",
+                            "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                            "policy-version": "7.7.7"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 6,
+                            "policy_updated_to_ver": 7,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                            "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                            "policy-version": "6.6.6"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 5,
+                            "policy_updated_to_ver": 6,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_dolor",
+                            "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                            "policy-version": "3.3.3"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 2,
+                            "policy_updated_to_ver": 3,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                            "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                            "policy-version": "2.2.2"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 1,
+                            "policy_updated_to_ver": 2,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": true,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 0,
+                                    "policy_updated_to_ver": 1,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1.xml",
+                                "policyVersion": "1.1.1",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "test_scope_prefix.pdp_decision_ametist": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 6,
+                                    "policy_updated_to_ver": 7,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ametist",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                                    "policy-version": "7.7.7"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ametist.7-7-7.xml",
+                                "policyVersion": "7.7.7",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "test_scope_prefix.pdp_decision_consectetur": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 5,
+                                    "policy_updated_to_ver": 6,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-version": "6.6.6"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_consectetur.6-6-6.xml",
+                                "policyVersion": "6.6.6",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "test_scope_prefix.pdp_decision_dolor": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 2,
+                                    "policy_updated_to_ver": 3,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_dolor",
+                                    "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                                    "policy-version": "3.3.3"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_dolor.3-3-3.xml",
+                                "policyVersion": "3.3.3",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "test_scope_prefix.pdp_decision_ipsum": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 1,
+                                    "policy_updated_to_ver": 2,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-version": "2.2.2"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ipsum.2-2-2.xml",
+                                "policyVersion": "2.2.2",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "test_scope_prefix.pdp_decision_sit": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 3,
+                                    "policy_updated_to_ver": 4,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_sit",
+                                    "policy-id": "test_scope_prefix.pdp_decision_sit",
+                                    "policy-version": "4.4.4"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_sit.4-4-4.xml",
+                                "policyVersion": "4.4.4",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_sit"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic YWxleC1ETUFBUF9NUl9VU0VSOmFsZXgtRE1BQVBfTVJfUFdE",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": ["garbage-to-be-ignored", "garbage-to-be-ignored"],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic YWxleC1ETUFBUF9NUl9VU0VSOmFsZXgtRE1BQVBfTVJfUFdE",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_Lorem",
+                        "policy_versions": {
+                            "0": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_amet",
+                        "policy_versions": {
+                            "5.5.5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ametist",
+                        "policy_versions": {
+                            "6": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_consectetur",
+                        "policy_versions": {
+                            "5": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_dolor",
+                        "policy_versions": {
+                            "2": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_ipsum",
+                        "policy_versions": {
+                            "1": true
+                        }
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "pending_update": false,
+                        "policy_id": "test_scope_prefix.pdp_decision_sit",
+                        "policy_versions": {
+                            "3": true
+                        }
+                    }
+                },
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic YWxleC1QRFBfVVNFUjphbGV4LVBEUF9QV0Q=",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "ONAPComponent": "policy_handler",
+                    "ONAPInstance": "*",
+                    "ONAPName": "DCAE",
+                    "action": "configure",
+                    "resource": {
+                        "policy-id": [
+                            "test_scope_prefix.pdp_decision_Lorem",
+                            "test_scope_prefix.pdp_decision_amet",
+                            "test_scope_prefix.pdp_decision_ametist",
+                            "test_scope_prefix.pdp_decision_consectetur",
+                            "test_scope_prefix.pdp_decision_dolor",
+                            "test_scope_prefix.pdp_decision_ipsum",
+                            "test_scope_prefix.pdp_decision_sit"
+                        ]
+                    }
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
+            },
+            "res": {
+                "policies": {
+                    "test_scope_prefix.pdp_decision_Lorem": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                            "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                            "policy-version": "1.1.1"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 0,
+                            "policy_updated_to_ver": 1,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_amet": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_amet",
+                            "policy-id": "test_scope_prefix.pdp_decision_amet",
+                            "policy-version": "5.5.5"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 4,
+                            "policy_updated_to_ver": 5,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_amet"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ametist": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ametist",
+                            "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                            "policy-version": "7.7.7"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 6,
+                            "policy_updated_to_ver": 7,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_consectetur": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                            "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                            "policy-version": "6.6.6"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 5,
+                            "policy_updated_to_ver": 6,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_dolor": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_dolor",
+                            "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                            "policy-version": "3.3.3"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 2,
+                            "policy_updated_to_ver": 3,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_ipsum": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                            "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                            "policy-version": "2.2.2"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 1,
+                            "policy_updated_to_ver": 2,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    },
+                    "test_scope_prefix.pdp_decision_sit": {
+                        "metadata": {
+                            "description": "description for test_scope_prefix.pdp_decision_sit",
+                            "policy-id": "test_scope_prefix.pdp_decision_sit",
+                            "policy-version": "4.4.4"
+                        },
+                        "properties": {
+                            "policy_hello": "world!",
+                            "policy_updated_from_ver": 3,
+                            "policy_updated_to_ver": 4,
+                            "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                        },
+                        "type": "unit.test.type.policies",
+                        "version": "1.0.0"
+                    }
+                }
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ECOMP-RequestID": "*",
+                    "X-ONAP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": true,
+                    "latest_policies": {
+                        "test_scope_prefix.pdp_decision_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 0,
+                                    "policy_updated_to_ver": 1,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-id": "test_scope_prefix.pdp_decision_Lorem",
+                                    "policy-version": "1.1.1"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_Lorem.1-1-1.xml",
+                                "policyVersion": "1.1.1",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_Lorem"
+                        },
+                        "test_scope_prefix.pdp_decision_ametist": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 6,
+                                    "policy_updated_to_ver": 7,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ametist"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ametist",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ametist",
+                                    "policy-version": "7.7.7"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ametist.7-7-7.xml",
+                                "policyVersion": "7.7.7",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ametist"
+                        },
+                        "test_scope_prefix.pdp_decision_consectetur": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 5,
+                                    "policy_updated_to_ver": 6,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-id": "test_scope_prefix.pdp_decision_consectetur",
+                                    "policy-version": "6.6.6"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_consectetur.6-6-6.xml",
+                                "policyVersion": "6.6.6",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_consectetur"
+                        },
+                        "test_scope_prefix.pdp_decision_dolor": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 2,
+                                    "policy_updated_to_ver": 3,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_dolor"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_dolor",
+                                    "policy-id": "test_scope_prefix.pdp_decision_dolor",
+                                    "policy-version": "3.3.3"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_dolor.3-3-3.xml",
+                                "policyVersion": "3.3.3",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_dolor"
+                        },
+                        "test_scope_prefix.pdp_decision_ipsum": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 1,
+                                    "policy_updated_to_ver": 2,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-id": "test_scope_prefix.pdp_decision_ipsum",
+                                    "policy-version": "2.2.2"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_ipsum.2-2-2.xml",
+                                "policyVersion": "2.2.2",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_ipsum"
+                        },
+                        "test_scope_prefix.pdp_decision_sit": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": 3,
+                                    "policy_updated_to_ver": 4,
+                                    "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                                },
+                                "metadata": {
+                                    "description": "description for test_scope_prefix.pdp_decision_sit",
+                                    "policy-id": "test_scope_prefix.pdp_decision_sit",
+                                    "policy-version": "4.4.4"
+                                },
+                                "policyName": "test_scope_prefix.pdp_decision_sit.4-4-4.xml",
+                                "policyVersion": "4.4.4",
+                                "type": "unit.test.type.policies",
+                                "version": "1.0.0"
+                            },
+                            "policy_id": "test_scope_prefix.pdp_decision_sit"
+                        }
+                    },
+                    "policy_filter_matches": {},
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": {
+                "server_instance_uuid": "e17fc584-7b06-4777-81c5-5da4337d6d16"
+            },
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Authorization": "Basic YWxleC1ETUFBUF9NUl9VU0VSOmFsZXgtRE1BQVBfTVJfUFdE",
+                    "Content-Type": "application/json",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "timeout": 15000
+                },
+                "uri": "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid"
+                },
+            "res": [],
+            "status_code": 200
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/main/mock_expected.py b/tests/main/mock_expected.py
deleted file mode 100644
index 450394c..0000000
--- a/tests/main/mock_expected.py
+++ /dev/null
@@ -1,526 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-#
-"""expected message history per test for pdp API 2019 and after"""
-
-
-HISTORY_EXPECTED = {
-    "tests/main/test_policy_rest.py::test_get_policy_latest" : [
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "ONAPComponent": "policy_handler",
-                    "ONAPInstance": "*",
-                    "ONAPName": "DCAE",
-                    "action": "configure",
-                    "resource": {
-                        "policy-id": [
-                            "test_scope_prefix.pdp_desition_sit"
-                        ]
-                    }
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
-            },
-            "res": "*",
-            "status_code": 200
-        }
-    ],
-    "tests/main/test_policyhandler.py::WebServerTest::test_web_all_policies_latest": [
-        {
-            "request": {
-                "headers": {
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": None,
-                "method": "get",
-                "params": {
-                    "cfy_tenant_name": "default_tenant"
-                },
-                "uri": "http://unit-test-deployment_handler:8188000/policy"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "policyName": "test_scope_prefix.Config_.*"
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
-            },
-            "res": "*",
-            "status_code": 200
-        }
-    ],
-    "tests/main/test_policyhandler.py::WebServerTest::test_web_policies_latest": [
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "policyName": "test_scope_prefix.Config_amet.*"
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
-            },
-            "res": "*",
-            "status_code": 200
-        }
-    ],
-    "tests/main/test_policyhandler.py::WebServerTest::test_web_policy_latest": [
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "ONAPComponent": "policy_handler",
-                    "ONAPInstance": "*",
-                    "ONAPName": "DCAE",
-                    "action": "configure",
-                    "resource": {
-                        "policy-id": [
-                            "test_scope_prefix.pdp_desition_sit"
-                        ]
-                    }
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/decision/v1/"
-            },
-            "res": "*",
-            "status_code": 200
-        }
-    ],
-    "tests/main/test_policyhandler.py::WebServerTest::test_zzzzz_shutdown": [
-        {
-            "request": {
-                "headers": {
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": None,
-                "method": "get",
-                "params": {
-                    "cfy_tenant_name": "default_tenant"
-                },
-                "uri": "http://unit-test-deployment_handler:8188000/policy"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "policyName": "test_scope_prefix.Config_.*"
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "catch_up": True,
-                    "latest_policies": {
-                        "test_scope_prefix.Config_Lorem": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "0",
-                                    "policy_updated_to_ver": "1",
-                                    "updated_policy_id": "test_scope_prefix.Config_Lorem"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_Lorem.1.xml",
-                                "policyVersion": "1",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_Lorem"
-                        },
-                        "test_scope_prefix.Config_amet": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "4",
-                                    "policy_updated_to_ver": "5",
-                                    "updated_policy_id": "test_scope_prefix.Config_amet"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_amet.5.xml",
-                                "policyVersion": "5",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_amet"
-                        },
-                        "test_scope_prefix.Config_ametist": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "6",
-                                    "policy_updated_to_ver": "7",
-                                    "updated_policy_id": "test_scope_prefix.Config_ametist"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_ametist.7.xml",
-                                "policyVersion": "7",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_ametist"
-                        },
-                        "test_scope_prefix.Config_consectetur": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "5",
-                                    "policy_updated_to_ver": "6",
-                                    "updated_policy_id": "test_scope_prefix.Config_consectetur"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_consectetur.6.xml",
-                                "policyVersion": "6",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_consectetur"
-                        },
-                        "test_scope_prefix.Config_dolor": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "2",
-                                    "policy_updated_to_ver": "3",
-                                    "updated_policy_id": "test_scope_prefix.Config_dolor"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_dolor.3.xml",
-                                "policyVersion": "3",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_dolor"
-                        },
-                        "test_scope_prefix.Config_ipsum": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "1",
-                                    "policy_updated_to_ver": "2",
-                                    "updated_policy_id": "test_scope_prefix.Config_ipsum"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_ipsum.2.xml",
-                                "policyVersion": "2",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_ipsum"
-                        },
-                        "test_scope_prefix.Config_sit": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "3",
-                                    "policy_updated_to_ver": "4",
-                                    "updated_policy_id": "test_scope_prefix.Config_sit"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_sit.4.xml",
-                                "policyVersion": "4",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_sit"
-                        }
-                    },
-                    "policy_filter_matches": {
-                        "test_scope_prefix.Config_Lorem": {},
-                        "test_scope_prefix.Config_amet": {},
-                        "test_scope_prefix.Config_ametist": {},
-                        "test_scope_prefix.Config_consectetur": {},
-                        "test_scope_prefix.Config_dolor": {},
-                        "test_scope_prefix.Config_ipsum": {},
-                        "test_scope_prefix.Config_sit": {}
-                    },
-                    "removed_policies": {}
-                },
-                "method": "put",
-                "params": {
-                    "cfy_tenant_name": "default_tenant"
-                },
-                "uri": "http://unit-test-deployment_handler:8188000/policy"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": None,
-                "method": "get",
-                "params": {
-                    "cfy_tenant_name": "default_tenant"
-                },
-                "uri": "http://unit-test-deployment_handler:8188000/policy"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "policyName": "test_scope_prefix.Config_ipsum"
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "policyName": "test_scope_prefix.Config_sit"
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "Accept": "application/json",
-                    "Authorization": "Basic auth",
-                    "ClientAuth": "Basic user",
-                    "Content-Type": "application/json",
-                    "Environment": "TEST",
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "policyName": "test_scope_prefix.Config_consectetur"
-                },
-                "method": "post",
-                "params": None,
-                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
-            },
-            "res": "*",
-            "status_code": 200
-        },
-        {
-            "request": {
-                "headers": {
-                    "X-ECOMP-RequestID": "*"
-                },
-                "json": {
-                    "catch_up": False,
-                    "latest_policies": {
-                        "test_scope_prefix.Config_consectetur": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "5",
-                                    "policy_updated_to_ver": "6",
-                                    "updated_policy_id": "test_scope_prefix.Config_consectetur"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_consectetur.6.xml",
-                                "policyVersion": "6",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_consectetur"
-                        },
-                        "test_scope_prefix.Config_ipsum": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "1",
-                                    "policy_updated_to_ver": "2",
-                                    "updated_policy_id": "test_scope_prefix.Config_ipsum"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_ipsum.2.xml",
-                                "policyVersion": "2",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_ipsum"
-                        },
-                        "test_scope_prefix.Config_sit": {
-                            "policy_body": {
-                                "config": {
-                                    "policy_hello": "world!",
-                                    "policy_updated_from_ver": "3",
-                                    "policy_updated_to_ver": "4",
-                                    "updated_policy_id": "test_scope_prefix.Config_sit"
-                                },
-                                "matchingConditions": {
-                                    "ConfigName": "alex_config_name",
-                                    "ONAPName": "DCAE"
-                                },
-                                "policyConfigMessage": "Config Retrieved! ",
-                                "policyConfigStatus": "CONFIG_RETRIEVED",
-                                "policyName": "test_scope_prefix.Config_sit.4.xml",
-                                "policyVersion": "4",
-                                "property": None,
-                                "responseAttributes": {},
-                                "type": "JSON"
-                            },
-                            "policy_id": "test_scope_prefix.Config_sit"
-                        }
-                    },
-                    "policy_filter_matches": {
-                        "test_scope_prefix.Config_consectetur": {},
-                        "test_scope_prefix.Config_ipsum": {},
-                        "test_scope_prefix.Config_sit": {}
-                    },
-                    "removed_policies": {}
-                },
-                "method": "put",
-                "params": {
-                    "cfy_tenant_name": "default_tenant"
-                },
-                "uri": "http://unit-test-deployment_handler:8188000/policy"
-            },
-            "res": "*",
-            "status_code": 200
-        }
-    ]
-}
diff --git a/tests/main/mock_policy_engine.py b/tests/main/mock_policy_engine.py
deleted file mode 100644
index 1bac045..0000000
--- a/tests/main/mock_policy_engine.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-#
-"""mocking for the policy-engine - shared by many tests"""
-
-import copy
-import json
-
-from policyhandler.pdp_api.pdp_consts import (PDP_METADATA,
-                                              PDP_POLICY_ID,
-                                              PDP_POLICY_VERSION,
-                                              PDP_POLICIES, PDP_PROPERTIES)
-from policyhandler.pdp_api.policy_utils import PolicyUtils
-from policyhandler.utils import Utils
-
-_LOGGER = Utils.get_logger(__file__)
-
-
-class MockPolicyEngine(object):
-    """pretend this is the policy-engine"""
-    scope_prefix = "test_scope_prefix.pdp_desition_"
-    LOREM_IPSUM = """Lorem ipsum dolor sit amet consectetur ametist""".split()
-    LONG_TEXT = "0123456789" * 100
-    _policies = {}
-
-    _inited = False
-
-    @staticmethod
-    def init():
-        """init collection of policies: policy_version = policy_index + 1"""
-        if MockPolicyEngine._inited:
-            return
-        MockPolicyEngine._inited = True
-
-        MockPolicyEngine._policies = dict(
-            (policy_id, MockPolicyEngine._create_policy_body(policy_id, policy_version))
-            for policy_id, policy_version in
-            [(MockPolicyEngine.get_policy_id(policy_index), policy_index + 1)
-             for policy_index in range(1 + len(MockPolicyEngine.LOREM_IPSUM))]
-        )
-        _LOGGER.info("_policies: %s", json.dumps(MockPolicyEngine._policies))
-
-    @staticmethod
-    def get_policy_id(policy_index):
-        """get the policy_id by policy_index"""
-        return (MockPolicyEngine.scope_prefix
-                + MockPolicyEngine.LOREM_IPSUM[
-                    policy_index % len(MockPolicyEngine.LOREM_IPSUM)])
-
-    @staticmethod
-    def get_policy(policy_id):
-        """find policy the way the policy-engine finds"""
-        if policy_id not in MockPolicyEngine._policies:
-            return {}
-        return {PDP_POLICIES: {policy_id: copy.deepcopy(MockPolicyEngine._policies[policy_id])}}
-
-    @staticmethod
-    def gen_policy_latest(policy_index, version_offset=0):
-        """generate the policy response from policy-handler by policy_index = version - 1"""
-        policy_id = MockPolicyEngine.get_policy_id(policy_index)
-        policy = PolicyUtils.convert_to_policy(
-            MockPolicyEngine._create_policy_body(policy_id, policy_index + 1 - version_offset)
-        )
-        return policy_id, policy
-
-    @staticmethod
-    def _create_policy_body(policy_id, policy_version=1):
-        """returns a fake policy-body"""
-        return {
-            "type": "unit.test.type.policies",
-            "version": "1.0.0",
-            PDP_METADATA: {
-                PDP_POLICY_ID: policy_id,
-                PDP_POLICY_VERSION: policy_version,
-                "description": "description for {}".format(policy_id)
-            },
-            PDP_PROPERTIES: {
-                "policy_updated_from_ver": (policy_version - 1),
-                "policy_updated_to_ver": policy_version,
-                "policy_hello": "world!",
-                "updated_policy_id": policy_id
-            }
-        }
diff --git a/tests/main/pdp_policies.json b/tests/main/pdp_policies.json
deleted file mode 100644
index b7d0d9e..0000000
--- a/tests/main/pdp_policies.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "policies": {
-        "onap.scaleout.tca": {
-            "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            "version": "1.0.0",
-            "metadata": {
-                "policy-id": "onap.scaleout.tca",
-                "policy-version": 1,
-                "description": "The scaleout policy for vDNS"
-            },
-            "properties": {
-                "tca_policy": {
-                    "domain": "measurementsForVfScaling",
-                    "metricsPerEventName": [
-                        {
-                            "eventName": "vLoadBalancer",
-                            "controlLoopSchemaType": "VNF",
-                            "policyScope": "type=configuration"
-                        }
-                    ]
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/main/test_policyhandler.py b/tests/main/test_policyhandler.py
index 73ab9ca..c474e29 100644
--- a/tests/main/test_policyhandler.py
+++ b/tests/main/test_policyhandler.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,20 +21,17 @@ import json
 import time
 import uuid
 
-import cherrypy
 import pytest
-from cherrypy.test.helper import CPWebCase
+import cherrypy
 
-from policyhandler.config import Config
-from policyhandler.onap.audit import REQUEST_X_ECOMP_REQUESTID, Audit
-from policyhandler.pdp_api.pdp_consts import POLICY_NAME
-from policyhandler.policy_consts import LATEST_POLICIES
+from cherrypy.test.helper import CPWebCase
+from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID,
+                                      REQUEST_X_ONAP_REQUESTID, Audit)
 from policyhandler.policy_receiver import PolicyReceiver
 from policyhandler.utils import Utils
 from policyhandler.web_server import _PolicyWeb
 
 from ..mock_tracker import Tracker
-from .mock_policy_engine import MockPolicyEngine
 
 _LOGGER = Utils.get_logger(__file__)
 
@@ -59,7 +56,27 @@ class WebServerTest(CPWebCase):
 
     def test_web_policy_latest(self):
         """test /policy_latest/<policy-id>"""
-        policy_id, expected_policy = MockPolicyEngine.gen_policy_latest(3)
+        policy_id = "test_scope_prefix.pdp_decision_sit"
+        expected_policy = {
+            "policy_id": "test_scope_prefix.pdp_decision_sit",
+            "policy_body": {
+                "type": "unit.test.type.policies",
+                "version": "1.0.0",
+                "metadata": {
+                    "policy-id": "test_scope_prefix.pdp_decision_sit",
+                    "policy-version": "4.4.4",
+                    "description": "description for test_scope_prefix.pdp_decision_sit"
+                },
+                "policyName": "test_scope_prefix.pdp_decision_sit.4-4-4.xml",
+                "policyVersion": "4.4.4",
+                "config": {
+                    "policy_updated_from_ver": 3,
+                    "policy_updated_to_ver": 4,
+                    "policy_hello": "world!",
+                    "updated_policy_id": "test_scope_prefix.pdp_decision_sit"
+                }
+            }
+        }
 
         self.getPage("/policy_latest/{0}".format(policy_id or ""))
         self.assertStatus('200 OK')
@@ -83,15 +100,17 @@ class WebServerTest(CPWebCase):
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        self.assertStatus('404 Not Found')
+        self.assertStatus('200 OK')
 
     def test_web_policies_latest(self):
         """test POST /policies_latest with policyName"""
         body = json.dumps({"junk": "to-be-developed"})
+        request_id = str(uuid.uuid4())
         result = self.getPage("/policies_latest", method='POST',
                               body=body,
                               headers=[
-                                  (REQUEST_X_ECOMP_REQUESTID, str(uuid.uuid4())),
+                                  (REQUEST_X_ECOMP_REQUESTID, request_id),
+                                  (REQUEST_X_ONAP_REQUESTID, request_id),
                                   ("Content-Type", "application/json"),
                                   ('Content-Length', str(len(body)))
                               ])
@@ -102,17 +121,20 @@ class WebServerTest(CPWebCase):
 
     @pytest.mark.usefixtures(
         "fix_deploy_handler",
+        "fix_dmaap_mr",
         "fix_cherrypy_engine_exit")
     def test_zzzzz_shutdown(self):
         """test shutdown"""
-        _LOGGER.info("start shutdown")
+        _LOGGER.info("testing the shutdown")
         assert not PolicyReceiver.is_running()
-        audit = Audit(job_name="test_zzzzz_shutdown", req_message="start shutdown")
+        audit = Audit(job_name="test_zzzzz_shutdown", req_message="testing the shutdown")
         PolicyReceiver.run(audit)
 
         result = self.getPage("/healthcheck")
         _LOGGER.info("healthcheck result: %s", result)
 
+        time.sleep(1)
+
         WebServerTest.do_gc_test = False
         _LOGGER.info("shutdown...")
         audit.audit_done("shutdown")
@@ -120,11 +142,32 @@ class WebServerTest(CPWebCase):
         _LOGGER.info("shutdown result: %s", result)
         self.assertStatus('200 OK')
         _LOGGER.info("got shutdown: %s", self.body)
-        time.sleep(1)
+        time.sleep(5)
         assert not PolicyReceiver.is_running()
 
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
+        Tracker.validate()
+
+    @pytest.mark.usefixtures(
+        "fix_deploy_handler",
+        "fix_dmaap_mr",
+        "fix_cherrypy_engine_exit")
+    def test_zzz_policy_updates_and_catch_ups(self):
+        """test run policy handler with policy updates and catchups"""
+        _LOGGER.info("start policy_updates_and_catch_ups")
+        assert not PolicyReceiver.is_running()
+
+        audit = Audit(job_name="test_zzz_policy_updates_and_catch_ups",
+                      req_message="start policy_updates_and_catch_ups")
+        PolicyReceiver.run(audit)
+
+        _LOGGER.info("sleep 20 before shutdown...")
+        time.sleep(20)
+
+        result = self.getPage("/healthcheck")
+        _LOGGER.info("healthcheck result: %s", result)
+
+        PolicyReceiver.shutdown(audit)
+        time.sleep(5)
+        assert not PolicyReceiver.is_running()
 
         Tracker.validate()
diff --git a/tests/main/test_pz_catch_up.py b/tests/main/test_pz_catch_up.py
new file mode 100644
index 0000000..03f5957
--- /dev/null
+++ b/tests/main/test_pz_catch_up.py
@@ -0,0 +1,63 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+"""test policy catch_up methods directly"""
+
+import json
+import time
+
+import pytest
+
+from policyhandler.onap.audit import Audit
+from policyhandler.policy_receiver import PolicyReceiver
+from policyhandler.utils import Utils
+
+from ..mock_tracker import Tracker
+
+_LOGGER = Utils.get_logger(__file__)
+
+@pytest.mark.usefixtures(
+    "fix_pdp_authorization",
+    "fix_discovery",
+    "fix_pdp_post",
+    "fix_deploy_handler",
+    "fix_dmaap_mr",
+    "fix_auto_catch_up"
+)
+def test_catch_up():
+    """test run policy handler with catchups and failed deployment-handler"""
+    _LOGGER.info("start test_catch_up")
+    assert not PolicyReceiver.is_running()
+    audit = Audit(job_name="test_catch_up", req_message="start test_catch_up")
+    PolicyReceiver.run(audit)
+
+    _LOGGER.info("sleep 12 before shutdown...")
+    time.sleep(12)
+
+    health = audit.health(full=True)
+    audit.audit_done(result=json.dumps(health))
+
+    _LOGGER.info("healthcheck: %s", json.dumps(health))
+    assert bool(health)
+
+    PolicyReceiver.shutdown(audit)
+    time.sleep(5)
+    assert not PolicyReceiver.is_running()
+
+    health = audit.health(full=True)
+    _LOGGER.info("healthcheck: %s", json.dumps(health))
+
+    Tracker.validate()
diff --git a/tests/mock_config.json b/tests/mock_config.json
index 30e3251..50e8862 100644
--- a/tests/mock_config.json
+++ b/tests/mock_config.json
@@ -29,6 +29,19 @@
             "timeout_in_secs": 1,
             "ws_ping_interval_in_secs": 1800
         },
+        "dmaap_mr" : {
+            "url" : "https://unit-test-dmaap-mr:280800000/events/unit-test-topicname/unit-test-consumegroup/unit-test-consumerid",
+            "query": {
+                "timeout": 15000
+            },
+            "headers" : {
+                "Content-Type" : "application/json",
+                "Authorization" : "Basic auth"
+            },
+            "target_entity" : "dmaap_mr",
+            "tls_ca_mode" : "cert_directory",
+            "timeout_in_secs": 60
+        },
         "deploy_handler" : {
             "target_entity" : "deployment_handler",
             "url" : "http://unit-test-deployment_handler:8188000",
diff --git a/tests/mock_settings.py b/tests/mock_settings.py
index 9e99561..dcfebcb 100644
--- a/tests/mock_settings.py
+++ b/tests/mock_settings.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,14 +65,16 @@ class MockSettings(object):
     deploy_handler_instance_uuid = str(uuid.uuid4())
 
     @staticmethod
-    def init():
+    def init_mock_config():
         """init configs"""
         if MockSettings._loaded:
             _LOGGER.info("testing policy_handler with config: %s", Config.discovered_config)
             return
         MockSettings._loaded = True
 
-        Config.init_config("tests/etc_config.json")
+        _LOGGER.info("init MockSettings")
+
+        MockSettings.reinit_mock_config()
 
         with open("tests/mock_config.json", 'r') as config_json:
             MockSettings.mock_config = json.load(config_json)
@@ -118,3 +120,8 @@ class MockSettings(object):
 
         importlib.reload(importlib.import_module("policyhandler.pdp_client"))
         _LOGGER.info("done setup_pdp_api %s", Config._pdp_api_version)
+
+    @staticmethod
+    def reinit_mock_config():
+        """reload the init configs"""
+        Config.init_config("tests/etc_config.json")
diff --git a/tests/mock_tracker.py b/tests/mock_tracker.py
index a5fffd5..2b51983 100644
--- a/tests/mock_tracker.py
+++ b/tests/mock_tracker.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,9 +20,12 @@ import copy
 import json
 
 from policyhandler.config import Config
-from policyhandler.onap.audit import REQUEST_X_ECOMP_REQUESTID
+from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID,
+                                      REQUEST_X_ONAP_REQUESTID)
 from policyhandler.utils import Utils
 
+REQUEST = "request"
+STATUS_CODE = "status_code"
 RESPONSE = "res"
 PEP_INSTANCE = "ONAPInstance"
 _LOGGER = Utils.get_logger(__file__)
@@ -49,15 +52,21 @@ class _MockHttpRequestInResponse(object):
 
 class MockHttpResponse(object):
     """Mock http response based on request"""
-    def __init__(self, method, uri, res_json, **kwargs):
+    def __init__(self, method, uri, res_json=None, **kwargs):
         """create response based on request"""
         self.request = _MockHttpRequestInResponse(method, uri, **kwargs)
-
-        self.status_code = kwargs.get("status_code", 200)
-        self.res = copy.deepcopy(res_json)
+        self.headers = {}
+
+        self.status_code, self.res = Tracker.get_response(self.request.to_json())
+        if self.status_code is None and res_json:
+            self.status_code = kwargs.get(STATUS_CODE, 200)
+        if res_json:
+            self.res = copy.deepcopy(res_json)
+        if self.status_code is None:
+            self.status_code = 500
         self.text = json.dumps(self.res)
 
-        self._track()
+        _LOGGER.info("MockHttpResponse: %s", self)
 
     def json(self):
         """returns json of response"""
@@ -70,15 +79,11 @@ class MockHttpResponse(object):
     def to_json(self):
         """create json of the message"""
         return {
-            "request": self.request.to_json(),
-            "status_code": self.status_code,
+            REQUEST: self.request.to_json(),
+            STATUS_CODE: self.status_code,
             RESPONSE: self.res
         }
 
-    def _track(self):
-        """append the message to tracker's history"""
-        Tracker.track(self.to_json())
-
     def __str__(self):
         """stringify for logging"""
         return json.dumps(self.to_json(), sort_keys=True)
@@ -87,30 +92,88 @@ class MockHttpResponse(object):
 class Tracker(object):
     """record all the messages going outside policy-handler during testing"""
     test_name = None
-    messages = []
     test_names = []
+
+    requests = []
+    expected = []
+
     validated_tests = {}
     valid_tests = {}
 
+    main_history = {}
+    pdp_api_v0_history = {}
+
+    @staticmethod
+    def _init():
+        """load expected data from json files"""
+        try:
+            with open("tests/main/expectations.json", 'r') as expectations:
+                Tracker.main_history = json.load(expectations)
+        except Exception:
+            Tracker.main_history = {}
+
+        try:
+            with open("tests/pdp_api_v0/expectations.json", 'r') as expectations:
+                Tracker.pdp_api_v0_history = json.load(expectations)
+        except Exception:
+            Tracker.pdp_api_v0_history = {}
+
     @staticmethod
     def reset(test_name=None):
         """remove all the messages from history"""
+        if not Tracker.test_names:
+            Tracker._init()
+
         Tracker.test_name = test_name
-        Tracker.messages.clear()
+        Tracker.requests.clear()
         Tracker.test_names.append(test_name)
 
+        if Config.is_pdp_api_default():
+            Tracker.expected = Tracker.main_history.get(Tracker.test_name, [])
+        else:
+            Tracker.expected = Tracker.pdp_api_v0_history.get(Tracker.test_name, [])
+
+
     @staticmethod
-    def track(message):
-        """append the tracked message to the history"""
-        message = copy.deepcopy(message)
-        Tracker.messages.append(message)
-        if _LOGGER:
-            _LOGGER.info("tracked_message: %s", json.dumps(message, sort_keys=True))
+    def get_response(request):
+        """
+        track the request to the history of requests
+        and return the response with the status_code from the expected history queue
+        """
+        request_idx = len(Tracker.requests)
+        request = copy.deepcopy(request)
+        Tracker.requests.append(request)
+
+        if request_idx < len(Tracker.expected):
+            expected = Tracker.expected[request_idx] or {}
+            masked_request = Tracker._hide_volatiles(copy.deepcopy(request))
+            expected_request = Tracker._hide_volatiles(copy.deepcopy(expected.get(REQUEST)))
+            if Utils.are_the_same(masked_request, expected_request):
+                _LOGGER.info("as expected[%s]: %s", request_idx,
+                             json.dumps(expected, sort_keys=True))
+                return expected.get(STATUS_CODE), expected.get(RESPONSE)
+
+            unexpected_request = {"unit-test-tracker": {
+                "request_idx": request_idx,
+                "received_request": copy.deepcopy(request),
+                "expected": copy.deepcopy(expected.get(REQUEST))
+            }}
+            _LOGGER.error("unexpected_request[%s]: %s", request_idx,
+                          json.dumps(unexpected_request, sort_keys=True))
+            return None, unexpected_request
+
+        unexpected_request = {"unit-test-tracker":{
+            "request_idx": request_idx, "out-of-range": len(Tracker.expected),
+            "received_request": copy.deepcopy(request)
+        }}
+        _LOGGER.error("unexpected_request[%s]: %s", request_idx,
+                      json.dumps(unexpected_request, sort_keys=True))
+        return None, unexpected_request
 
     @staticmethod
     def to_string():
         """stringify message history for logging"""
-        return json.dumps(Tracker.messages, sort_keys=True)
+        return json.dumps(Tracker.requests, sort_keys=True)
 
     @staticmethod
     def get_status(test_name=None):
@@ -131,15 +194,14 @@ class Tracker(object):
         for idx, test_name in enumerate(Tracker.test_names):
             _LOGGER.info("%s[%s]: %s", Tracker.get_status(test_name), (idx + 1), test_name)
 
-        _LOGGER.info("not tracked test_names listed in main.mock_expected")
-        from .main.mock_expected import HISTORY_EXPECTED as main_history
-        for test_name in main_history:
+        _LOGGER.info("not tracked test_names listed in main.expectations")
+
+        for test_name in Tracker.main_history:
             if test_name not in Tracker.test_names:
                 _LOGGER.info("untracked: %s", test_name)
 
-        _LOGGER.info("not tracked test_names listed in pdp_api_v0.mock_expected")
-        from .pdp_api_v0.mock_expected import HISTORY_EXPECTED as pdp_api_v0_history
-        for test_name in pdp_api_v0_history:
+        _LOGGER.info("not tracked test_names listed in pdp_api_v0.expectations")
+        for test_name in Tracker.pdp_api_v0_history:
             if test_name not in Tracker.test_names:
                 _LOGGER.info("untracked: %s", test_name)
 
@@ -150,7 +212,7 @@ class Tracker(object):
             return obj
 
         for key, value in obj.items():
-            if key in [REQUEST_X_ECOMP_REQUESTID, RESPONSE, PEP_INSTANCE]:
+            if key in [REQUEST_X_ONAP_REQUESTID, REQUEST_X_ECOMP_REQUESTID, RESPONSE, PEP_INSTANCE]:
                 obj[key] = "*"
             elif isinstance(value, dict):
                 obj[key] = Tracker._hide_volatiles(value)
@@ -161,20 +223,15 @@ class Tracker(object):
     def validate():
         """validate that the message history is as expected"""
         _LOGGER.info("Tracker.validate(%s)", Tracker.test_name)
-        messages = [Tracker._hide_volatiles(copy.deepcopy(message))
-                    for message in Tracker.messages]
         Tracker.validated_tests[Tracker.test_name] = True
-
-        if Config.is_pdp_api_default():
-            from .main.mock_expected import HISTORY_EXPECTED as main_history
-            expected = main_history.get(Tracker.test_name, [])
-        else:
-            from .pdp_api_v0.mock_expected import HISTORY_EXPECTED as pdp_api_v0_history
-            expected = pdp_api_v0_history.get(Tracker.test_name, [])
-
-        _LOGGER.info("messages: %s", json.dumps(messages, sort_keys=True))
-        _LOGGER.info("expected: %s", json.dumps(expected, sort_keys=True))
-        assert Utils.are_the_same(messages, expected)
+        requests = [Tracker._hide_volatiles(copy.deepcopy(request))
+                    for request in Tracker.requests]
+        expected_reqs = [Tracker._hide_volatiles(copy.deepcopy(expected.get(REQUEST)))
+                         for expected in Tracker.expected]
+
+        _LOGGER.info("requests: %s", json.dumps(requests, sort_keys=True))
+        _LOGGER.info("expected: %s", json.dumps(expected_reqs, sort_keys=True))
+        assert Utils.are_the_same(requests, expected_reqs)
 
         _LOGGER.info("history valid for Tracker.validate(%s)", Tracker.test_name)
         Tracker.valid_tests[Tracker.test_name] = True
diff --git a/tests/pdp_api_v0/conftest.py b/tests/pdp_api_v0/conftest.py
index 07e566f..8220778 100644
--- a/tests/pdp_api_v0/conftest.py
+++ b/tests/pdp_api_v0/conftest.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,11 +22,14 @@ https://docs.pytest.org/en/latest/fixture.html
 import pytest
 
 from policyhandler import pdp_client
+from policyhandler.deploy_handler import DeployHandler
+from policyhandler.onap.audit import Audit
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME
 from policyhandler.utils import Utils
 
 from ..mock_settings import MockSettings
 from ..mock_tracker import MockHttpResponse
+from .mock_deploy_handler import MockDeploymentHandler
 from .mock_policy_engine import MockPolicyEngine2018
 from .mock_websocket import MockWebSocket
 
@@ -57,9 +60,10 @@ def fix_pdp_post(monkeypatch):
     def monkeyed_policy_rest_post(uri, json=None, **kwargs):
         """monkeypatch for the POST to policy-engine"""
         res_json = MockPolicyEngine2018.get_config(json.get(POLICY_NAME))
-        return MockHttpResponse("post", uri, res_json, json=json, **kwargs)
+        return MockHttpResponse("post", uri, res_json=res_json, json=json, **kwargs)
 
     _LOGGER.info("setup fix_pdp_post")
+    pdp_client.PolicyRest._lazy_inited = False
     pdp_client.PolicyRest._lazy_init()
     monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post',
                         monkeyed_policy_rest_post)
@@ -72,9 +76,10 @@ def fix_pdp_post_big(monkeypatch):
     def monkeyed_policy_rest_post(uri, **kwargs):
         """monkeypatch for the POST to policy-engine"""
         res_json = MockPolicyEngine2018.get_configs_all()
-        return MockHttpResponse("post", uri, res_json, **kwargs)
+        return MockHttpResponse("post", uri, res_json=res_json, **kwargs)
 
     _LOGGER.info("setup fix_pdp_post_big")
+    pdp_client.PolicyRest._lazy_inited = False
     pdp_client.PolicyRest._lazy_init()
     monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post',
                         monkeyed_policy_rest_post)
@@ -94,6 +99,7 @@ def fix_pdp_post_boom(monkeypatch):
         raise MockException("fix_pdp_post_boom {}".format(uri))
 
     _LOGGER.info("setup fix_pdp_post_boom")
+    pdp_client.PolicyRest._lazy_inited = False
     pdp_client.PolicyRest._lazy_init()
     monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post',
                         monkeyed_policy_rest_post_boom)
@@ -131,3 +137,96 @@ def fix_select_latest_policies_boom(monkeypatch):
 
     yield fix_select_latest_policies_boom
     _LOGGER.info("teardown fix_select_latest_policies_boom at %s", policy_utils_path)
+
+@pytest.fixture()
+def fix_deploy_handler(monkeypatch):
+    """monkeyed requests to deployment-handler"""
+    def monkeyed_deploy_handler_put(uri, **kwargs):
+        """monkeypatch for policy-update request.put to deploy_handler"""
+        return MockHttpResponse("put", uri, res_json=MockDeploymentHandler.default_response(),
+                                **kwargs)
+
+    def monkeyed_deploy_handler_get(uri, **kwargs):
+        """monkeypatch policy-update request.get to deploy_handler"""
+        return MockHttpResponse("get", uri,
+                                res_json=MockDeploymentHandler.get_deployed_policies(),
+                                **kwargs)
+
+    _LOGGER.info("setup fix_deploy_handler")
+    audit = None
+    if DeployHandler._lazy_inited is False:
+        audit = Audit(req_message="fix_deploy_handler")
+        DeployHandler._lazy_init(audit)
+
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
+                        monkeyed_deploy_handler_put)
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
+                        monkeyed_deploy_handler_get)
+
+    yield fix_deploy_handler
+    if audit:
+        audit.audit_done("teardown")
+    _LOGGER.info("teardown fix_deploy_handler")
+
+
+@pytest.fixture()
+def fix_deploy_handler_413(monkeypatch):
+    """monkeyed failed discovery request.get"""
+    def monkeyed_deploy_handler_put(uri, **kwargs):
+        """monkeypatch for deploy_handler"""
+        return MockHttpResponse(
+            "put", uri,
+            res_json={"server_instance_uuid": MockSettings.deploy_handler_instance_uuid},
+            status_code=413, **kwargs
+        )
+
+    def monkeyed_deploy_handler_get(uri, **kwargs):
+        """monkeypatch policy-update request.get to deploy_handler"""
+        return MockHttpResponse("get", uri, res_json=MockDeploymentHandler.get_deployed_policies(),
+                                **kwargs)
+
+    _LOGGER.info("setup fix_deploy_handler_413")
+    audit = None
+    if DeployHandler._lazy_inited is False:
+        audit = Audit(req_message="fix_deploy_handler_413")
+        DeployHandler._lazy_init(audit)
+
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
+                        monkeyed_deploy_handler_put)
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
+                        monkeyed_deploy_handler_get)
+
+    yield fix_deploy_handler_413
+    if audit:
+        audit.audit_done("teardown")
+    _LOGGER.info("teardown fix_deploy_handler_413")
+
+
+@pytest.fixture()
+def fix_deploy_handler_404(monkeypatch):
+    """monkeyed failed discovery request.get"""
+    def monkeyed_deploy_handler_put(uri, **kwargs):
+        """monkeypatch for deploy_handler"""
+        return MockHttpResponse("put", uri, res_json=MockDeploymentHandler.default_response(),
+                                **kwargs)
+
+    def monkeyed_deploy_handler_get(uri, **kwargs):
+        """monkeypatch policy-update request.get to deploy_handler"""
+        return MockHttpResponse("get", uri, res_json=MockDeploymentHandler.default_response(),
+                                **kwargs)
+
+    _LOGGER.info("setup fix_deploy_handler_404")
+    audit = None
+    if DeployHandler._lazy_inited is False:
+        audit = Audit(req_message="fix_deploy_handler_404")
+        DeployHandler._lazy_init(audit)
+
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put',
+                        monkeyed_deploy_handler_put)
+    monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get',
+                        monkeyed_deploy_handler_get)
+
+    yield fix_deploy_handler_404
+    if audit:
+        audit.audit_done("teardown")
+    _LOGGER.info("teardown fix_deploy_handler_404")
diff --git a/tests/pdp_api_v0/mock_expected.py b/tests/pdp_api_v0/expectations.json
index 6210e10..9c7a285 100644
--- a/tests/pdp_api_v0/mock_expected.py
+++ b/tests/pdp_api_v0/expectations.json
@@ -1,24 +1,5 @@
-# ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-#
-"""expected message history per test for pdp API 2018 and before"""
-
-
-HISTORY_EXPECTED = {
-    "tests/pdp_api_v0/test_policy_rest.py::test_get_policy_latest" : [
+{
+    "tests/pdp_api_v0/test_policy_rest.py::test_get_policy_latest": [
         {
             "request": {
                 "headers": {
@@ -27,13 +8,37 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_sit"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
+            },
+            "res": "*",
+            "status_code": 200
+        }
+    ],
+    "tests/pdp_api_v0/test_policy_rest_auth.py::test_get_policy_latest": [
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic YWxleC1QRFBfVVNFUjphbGV4LVBEUF9QV0Q=",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": {
+                    "policyName": "test_scope_prefix.Config_sit"
+                },
+                "method": "post",
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -44,9 +49,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -64,13 +70,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -86,13 +93,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_amet.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -108,13 +116,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_sit"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -125,9 +134,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -145,13 +155,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -160,10 +171,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -181,7 +193,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -203,7 +215,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -225,7 +237,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -247,7 +259,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -269,7 +281,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -291,7 +303,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -313,7 +325,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -343,9 +355,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -363,13 +376,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -378,10 +392,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -399,7 +414,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -421,7 +436,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -443,7 +458,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -465,7 +480,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -487,7 +502,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -509,7 +524,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -531,7 +546,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -563,9 +578,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -583,13 +599,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -598,10 +615,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -619,7 +637,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -641,7 +659,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -663,7 +681,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -685,7 +703,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -707,7 +725,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -729,7 +747,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -751,7 +769,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -781,9 +799,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -801,13 +820,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_ipsum"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -821,13 +841,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_sit"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -841,13 +862,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_consectetur"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -856,10 +878,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": False,
+                    "catch_up": false,
                     "latest_policies": {
                         "test_scope_prefix.Config_consectetur": {
                             "policy_body": {
@@ -877,7 +900,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -899,7 +922,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -921,7 +944,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -949,9 +972,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -969,13 +993,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -984,10 +1009,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -1005,7 +1031,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1027,7 +1053,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1049,7 +1075,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1071,7 +1097,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1093,7 +1119,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1115,7 +1141,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1137,7 +1163,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1167,9 +1193,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -1187,13 +1214,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_ipsum"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1207,13 +1235,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_sit"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1227,13 +1256,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_consectetur"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1242,10 +1272,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": False,
+                    "catch_up": false,
                     "latest_policies": {
                         "test_scope_prefix.Config_consectetur": {
                             "policy_body": {
@@ -1263,7 +1294,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1285,7 +1316,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1307,7 +1338,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1335,9 +1366,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -1355,13 +1387,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1370,10 +1403,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -1391,7 +1425,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1413,7 +1447,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1435,7 +1469,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1457,7 +1491,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1479,7 +1513,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1501,7 +1535,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1523,7 +1557,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1553,9 +1587,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -1573,13 +1608,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_ipsum"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1588,10 +1624,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": False,
+                    "catch_up": false,
                     "latest_policies": {
                         "test_scope_prefix.Config_ipsum": {
                             "policy_body": {
@@ -1609,7 +1646,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1633,9 +1670,231 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": null,
+                "method": "get",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": "*",
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "Accept": "application/json",
+                    "Authorization": "Basic auth",
+                    "ClientAuth": "Basic user",
+                    "Content-Type": "application/json",
+                    "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": {
+                    "policyName": "test_scope_prefix.Config_.*"
+                },
+                "method": "post",
+                "params": null,
+                "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
+            },
+            "res": "*",
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
+                    "X-ECOMP-RequestID": "*"
+                },
+                "json": {
+                    "catch_up": true,
+                    "latest_policies": {
+                        "test_scope_prefix.Config_Lorem": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "0",
+                                    "policy_updated_to_ver": "1",
+                                    "updated_policy_id": "test_scope_prefix.Config_Lorem"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_Lorem.1.xml",
+                                "policyVersion": "1",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_Lorem"
+                        },
+                        "test_scope_prefix.Config_amet": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "4",
+                                    "policy_updated_to_ver": "5",
+                                    "updated_policy_id": "test_scope_prefix.Config_amet"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_amet.5.xml",
+                                "policyVersion": "5",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_amet"
+                        },
+                        "test_scope_prefix.Config_ametist": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "6",
+                                    "policy_updated_to_ver": "7",
+                                    "updated_policy_id": "test_scope_prefix.Config_ametist"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_ametist.7.xml",
+                                "policyVersion": "7",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_ametist"
+                        },
+                        "test_scope_prefix.Config_consectetur": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "5",
+                                    "policy_updated_to_ver": "6",
+                                    "updated_policy_id": "test_scope_prefix.Config_consectetur"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_consectetur.6.xml",
+                                "policyVersion": "6",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_consectetur"
+                        },
+                        "test_scope_prefix.Config_dolor": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "2",
+                                    "policy_updated_to_ver": "3",
+                                    "updated_policy_id": "test_scope_prefix.Config_dolor"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_dolor.3.xml",
+                                "policyVersion": "3",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_dolor"
+                        },
+                        "test_scope_prefix.Config_ipsum": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "1",
+                                    "policy_updated_to_ver": "2",
+                                    "updated_policy_id": "test_scope_prefix.Config_ipsum"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_ipsum.2.xml",
+                                "policyVersion": "2",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_ipsum"
+                        },
+                        "test_scope_prefix.Config_sit": {
+                            "policy_body": {
+                                "config": {
+                                    "policy_hello": "world!",
+                                    "policy_updated_from_ver": "3",
+                                    "policy_updated_to_ver": "4",
+                                    "updated_policy_id": "test_scope_prefix.Config_sit"
+                                },
+                                "matchingConditions": {
+                                    "ConfigName": "alex_config_name",
+                                    "ONAPName": "DCAE"
+                                },
+                                "policyConfigMessage": "Config Retrieved! ",
+                                "policyConfigStatus": "CONFIG_RETRIEVED",
+                                "policyName": "test_scope_prefix.Config_sit.4.xml",
+                                "policyVersion": "4",
+                                "property": null,
+                                "responseAttributes": {},
+                                "type": "JSON"
+                            },
+                            "policy_id": "test_scope_prefix.Config_sit"
+                        }
+                    },
+                    "policy_filter_matches": {
+                        "test_scope_prefix.Config_Lorem": {},
+                        "test_scope_prefix.Config_amet": {},
+                        "test_scope_prefix.Config_ametist": {},
+                        "test_scope_prefix.Config_consectetur": {},
+                        "test_scope_prefix.Config_dolor": {},
+                        "test_scope_prefix.Config_ipsum": {},
+                        "test_scope_prefix.Config_sit": {}
+                    },
+                    "removed_policies": {}
+                },
+                "method": "put",
+                "params": {
+                    "cfy_tenant_name": "default_tenant"
+                },
+                "uri": "http://unit-test-deployment_handler:8188000/policy"
+            },
+            "res": "*",
+            "status_code": 200
+        },
+        {
+            "request": {
+                "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -1653,13 +1912,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_dolor"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1673,13 +1933,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_amet"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1688,10 +1949,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": False,
+                    "catch_up": false,
                     "latest_policies": {
                         "test_scope_prefix.Config_amet": {
                             "policy_body": {
@@ -1709,7 +1971,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1731,7 +1993,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1756,9 +2018,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -1776,13 +2039,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -1791,10 +2055,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -1812,7 +2077,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1834,7 +2099,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1856,7 +2121,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1878,7 +2143,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1900,7 +2165,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1922,7 +2187,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1944,7 +2209,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -1976,9 +2241,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -1996,13 +2262,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2011,10 +2278,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -2027,7 +2295,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2044,7 +2312,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2061,7 +2329,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2078,7 +2346,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2095,7 +2363,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2112,7 +2380,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2129,7 +2397,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2159,9 +2427,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2179,13 +2448,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2194,10 +2464,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -2210,7 +2481,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2227,7 +2498,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2244,7 +2515,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2261,7 +2532,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2278,7 +2549,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2295,7 +2566,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2312,7 +2583,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2342,9 +2613,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2362,13 +2634,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2377,10 +2650,11 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
-                    "catch_up": True,
+                    "catch_up": true,
                     "latest_policies": {
                         "test_scope_prefix.Config_Lorem": {
                             "policy_body": {
@@ -2393,7 +2667,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_Lorem.1.xml",
                                 "policyVersion": "1",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2410,7 +2684,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_amet.5.xml",
                                 "policyVersion": "5",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2427,7 +2701,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ametist.7.xml",
                                 "policyVersion": "7",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2444,7 +2718,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_consectetur.6.xml",
                                 "policyVersion": "6",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2461,7 +2735,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_dolor.3.xml",
                                 "policyVersion": "3",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2478,7 +2752,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_ipsum.2.xml",
                                 "policyVersion": "2",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2495,7 +2769,7 @@ HISTORY_EXPECTED = {
                                 "policyConfigStatus": "CONFIG_RETRIEVED",
                                 "policyName": "test_scope_prefix.Config_sit.4.xml",
                                 "policyVersion": "4",
-                                "property": None,
+                                "property": null,
                                 "responseAttributes": {},
                                 "type": "JSON"
                             },
@@ -2527,9 +2801,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2542,9 +2817,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2557,9 +2833,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2574,9 +2851,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2591,9 +2869,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2606,9 +2885,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2621,9 +2901,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2636,9 +2917,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2653,9 +2935,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2668,9 +2951,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2685,9 +2969,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2700,9 +2985,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2717,9 +3003,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2732,9 +3019,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2749,9 +3037,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2769,13 +3058,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2791,13 +3081,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_amet.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2813,13 +3104,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_sit"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2830,9 +3122,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2850,13 +3143,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2867,9 +3161,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2887,13 +3182,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2902,9 +3198,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2922,13 +3219,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2939,9 +3237,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2959,13 +3258,14 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
@@ -2976,9 +3276,10 @@ HISTORY_EXPECTED = {
         {
             "request": {
                 "headers": {
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
-                "json": None,
+                "json": null,
                 "method": "get",
                 "params": {
                     "cfy_tenant_name": "default_tenant"
@@ -2996,17 +3297,18 @@ HISTORY_EXPECTED = {
                     "ClientAuth": "Basic user",
                     "Content-Type": "application/json",
                     "Environment": "TEST",
+                    "X-ONAP-RequestID": "*",
                     "X-ECOMP-RequestID": "*"
                 },
                 "json": {
                     "policyName": "test_scope_prefix.Config_.*"
                 },
                 "method": "post",
-                "params": None,
+                "params": null,
                 "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig"
             },
             "res": "*",
             "status_code": 200
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/tests/mock_deploy_handler.py b/tests/pdp_api_v0/mock_deploy_handler.py
index cd8e791..5446070 100644
--- a/tests/mock_deploy_handler.py
+++ b/tests/pdp_api_v0/mock_deploy_handler.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
 #
 """mocking for the deployment-handler - shared by many tests"""
 
+import json
+
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_VERSION
 from policyhandler.policy_consts import POLICY_BODY, POLICY_ID, POLICY_VERSIONS
+from policyhandler.utils import Utils
 
-from .mock_settings import MockSettings
-from .pdp_api_v0.mock_policy_engine import MockPolicyEngine2018
+from ..mock_settings import MockSettings
+from .mock_policy_engine import MockPolicyEngine2018
 
+_LOGGER = Utils.get_logger(__file__)
 
 class MockDeploymentHandler(object):
     """pretend this is the deployment-handler"""
@@ -34,14 +38,16 @@ class MockDeploymentHandler(object):
     @staticmethod
     def get_deployed_policies():
         """generate the deployed policies message"""
+        all_policies = MockPolicyEngine2018.gen_all_policies_latest(version_offset=1)
+        _LOGGER.info("all_policies: %s", json.dumps(all_policies))
+
         response = MockDeploymentHandler.default_response()
         policies = dict(
             (policy_id, {
                 POLICY_ID: policy_id,
                 POLICY_VERSIONS: {policy.get(POLICY_BODY, {}).get(POLICY_VERSION, "999"): True},
                 "pending_update": False})
-            for policy_id, policy in (
-                MockPolicyEngine2018.gen_all_policies_latest(version_offset=1).items()))
+            for policy_id, policy in all_policies.items())
         response["policies"] = policies
 
         return response
diff --git a/tests/pdp_api_v0/mock_websocket.py b/tests/pdp_api_v0/mock_websocket.py
index 17f3bbe..3e3e63b 100644
--- a/tests/pdp_api_v0/mock_websocket.py
+++ b/tests/pdp_api_v0/mock_websocket.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import time
 
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME
 from policyhandler.pdp_api_v0.policy_listener import (LOADED_POLICIES,
-                                                        POLICY_VER,
-                                                        REMOVED_POLICIES)
+                                                      POLICY_VER,
+                                                      REMOVED_POLICIES)
 from policyhandler.utils import Utils
 
 from .mock_policy_engine import MockPolicyEngine2018
diff --git a/tests/main/test_policy_rest.py b/tests/pdp_api_v0/test_policy_rest_auth.py
index 964a21d..dd8dc83 100644
--- a/tests/main/test_policy_rest.py
+++ b/tests/pdp_api_v0/test_policy_rest_auth.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,14 +25,14 @@ from policyhandler.onap.audit import Audit
 from policyhandler.utils import Utils
 
 from ..mock_tracker import Tracker
-from .mock_policy_engine import MockPolicyEngine
+from .mock_policy_engine import MockPolicyEngine2018
 
 _LOGGER = Utils.get_logger(__file__)
 
-@pytest.mark.usefixtures("fix_pdp_post")
+@pytest.mark.usefixtures("fix_pdp_authorization", "fix_pdp_api_v0", "fix_pdp_post")
 def test_get_policy_latest():
     """test /policy_latest/<policy-id>"""
-    policy_id, expected_policy = MockPolicyEngine.gen_policy_latest(3)
+    policy_id, expected_policy = MockPolicyEngine2018.gen_policy_latest(3)
 
     audit = Audit(job_name="test_get_policy_latest",
                   req_message="get /policy_latest/{}".format(policy_id or ""))
diff --git a/tests/pdp_api_v0/test_policyhandler.py b/tests/pdp_api_v0/test_policyhandler.py
index 2b2629b..06de265 100644
--- a/tests/pdp_api_v0/test_policyhandler.py
+++ b/tests/pdp_api_v0/test_policyhandler.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@ import json
 import time
 import uuid
 
-import cherrypy
 import pytest
-from cherrypy.test.helper import CPWebCase
 
+import cherrypy
+from cherrypy.test.helper import CPWebCase
 from policyhandler.config import Config
-from policyhandler.onap.audit import REQUEST_X_ECOMP_REQUESTID, Audit
+from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID,
+                                      REQUEST_X_ONAP_REQUESTID, Audit)
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME
 from policyhandler.policy_consts import LATEST_POLICIES
 from policyhandler.policy_receiver import PolicyReceiver
@@ -89,10 +90,6 @@ class WebServer2018Test(CPWebCase):
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus('200 OK')
 
         policies_latest = json.loads(self.body)
@@ -114,20 +111,18 @@ class WebServer2018Test(CPWebCase):
         expected_policies = MockPolicyEngine2018.gen_policies_latest(match_to_policy_name)
 
         body = json.dumps({POLICY_NAME: match_to_policy_name})
+        request_id = str(uuid.uuid4())
         result = self.getPage("/policies_latest", method='POST',
                               body=body,
                               headers=[
-                                  (REQUEST_X_ECOMP_REQUESTID, str(uuid.uuid4())),
+                                  (REQUEST_X_ECOMP_REQUESTID, request_id),
+                                  (REQUEST_X_ONAP_REQUESTID, request_id),
                                   ("Content-Type", "application/json"),
                                   ('Content-Length', str(len(body)))
                               ])
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus('200 OK')
 
         policies_latest = json.loads(self.body)[LATEST_POLICIES]
@@ -144,10 +139,6 @@ class WebServer2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_policy_updates_and_catch_ups(self):
         """test run policy handler with policy updates and catchups"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start policy_updates_and_catch_ups")
         assert not PolicyReceiver.is_running()
 
@@ -177,10 +168,6 @@ class WebServer2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_catch_up_on_deploy_handler_changed(self):
         """test run policy handler with deployment-handler changed underneath"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start zzz_catch_up_on_deploy_handler_changed")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_catch_up_on_deploy_handler_changed",
@@ -201,8 +188,8 @@ class WebServer2018Test(CPWebCase):
         _LOGGER.info("sleep after send_notification...")
         time.sleep(3)
 
-        _LOGGER.info("sleep 5 before shutdown...")
-        time.sleep(5)
+        _LOGGER.info("sleep 3 before shutdown...")
+        time.sleep(3)
 
         result = self.getPage("/healthcheck")
         _LOGGER.info("healthcheck result: %s", result)
@@ -216,10 +203,6 @@ class WebServer2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_get_catch_up(self):
         """test /catch_up"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start /catch_up")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_get_catch_up", req_message="start /catch_up")
@@ -273,8 +256,4 @@ class WebServer2018Test(CPWebCase):
         time.sleep(1)
         assert not PolicyReceiver.is_running()
 
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         Tracker.validate()
diff --git a/tests/pdp_api_v0/test_pz_catch_up.py b/tests/pdp_api_v0/test_pz_catch_up.py
index 3b37af5..8d461e8 100644
--- a/tests/pdp_api_v0/test_pz_catch_up.py
+++ b/tests/pdp_api_v0/test_pz_catch_up.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import time
 
 import pytest
 
-from policyhandler.config import Config
 from policyhandler.onap.audit import Audit
 from policyhandler.policy_receiver import PolicyReceiver
 from policyhandler.utils import Utils
@@ -40,10 +39,6 @@ _LOGGER = Utils.get_logger(__file__)
 )
 def test_catch_up_failed_dh():
     """test run policy handler with catchups and failed deployment-handler"""
-    if Config.is_pdp_api_default():
-        _LOGGER.info("passive for new PDP API")
-        return
-
     _LOGGER.info("start test_catch_up_failed_dh")
     assert not PolicyReceiver.is_running()
     audit = Audit(job_name="test_catch_up_failed_dh",
@@ -78,10 +73,6 @@ def test_catch_up_failed_dh():
 )
 def test_catch_up_dh_404():
     """test run policy handler with catchups and failed deployment-handler"""
-    if Config.is_pdp_api_default():
-        _LOGGER.info("passive for new PDP API")
-        return
-
     _LOGGER.info("start test_catch_up_dh_404")
     assert not PolicyReceiver.is_running()
     audit = Audit(job_name="test_catch_up_dh_404",
diff --git a/tests/pdp_api_v0/test_pz_pdp_boom.py b/tests/pdp_api_v0/test_pz_pdp_boom.py
index effadc2..8ce42a7 100644
--- a/tests/pdp_api_v0/test_pz_pdp_boom.py
+++ b/tests/pdp_api_v0/test_pz_pdp_boom.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import uuid
 import cherrypy
 import pytest
 from cherrypy.test.helper import CPWebCase
-
 from policyhandler.config import Config
-from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID, Audit,
+from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID,
+                                      REQUEST_X_ONAP_REQUESTID, Audit,
                                       AuditHttpCode)
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME
 from policyhandler.policy_receiver import PolicyReceiver
@@ -80,10 +80,6 @@ class WebServerPDPBoom2018Test(CPWebCase):
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus(AuditHttpCode.SERVER_INTERNAL_ERROR.value)
 
         result = self.getPage("/healthcheck")
@@ -96,20 +92,18 @@ class WebServerPDPBoom2018Test(CPWebCase):
         match_to_policy_name = MockPolicyEngine2018.scope_prefix + "amet.*"
 
         body = json.dumps({POLICY_NAME: match_to_policy_name})
+        request_id = str(uuid.uuid4())
         result = self.getPage("/policies_latest", method='POST',
                               body=body,
                               headers=[
-                                  (REQUEST_X_ECOMP_REQUESTID, str(uuid.uuid4())),
+                                  (REQUEST_X_ECOMP_REQUESTID, request_id),
+                                  (REQUEST_X_ONAP_REQUESTID, request_id),
                                   ("Content-Type", "application/json"),
                                   ('Content-Length', str(len(body)))
                               ])
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus(AuditHttpCode.SERVER_INTERNAL_ERROR.value)
 
         result = self.getPage("/healthcheck")
@@ -120,10 +114,6 @@ class WebServerPDPBoom2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_policy_updates_and_catch_ups(self):
         """test run policy handler with policy updates and catchups"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start policy_updates_and_catch_ups")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_policy_updates_and_catch_ups",
@@ -152,10 +142,6 @@ class WebServerPDPBoom2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_catch_up_on_deploy_handler_changed(self):
         """test run policy handler with deployment-handler changed underneath"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start zzz_catch_up_on_deploy_handler_changed")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_catch_up_on_deploy_handler_changed",
@@ -191,10 +177,6 @@ class WebServerPDPBoom2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_get_catch_up(self):
         """test /catch_up"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start /catch_up")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_get_catch_up", req_message="start /catch_up")
@@ -248,8 +230,4 @@ class WebServerPDPBoom2018Test(CPWebCase):
         time.sleep(1)
         assert not PolicyReceiver.is_running()
 
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         Tracker.validate()
diff --git a/tests/pdp_api_v0/test_pz_ph_boom.py b/tests/pdp_api_v0/test_pz_ph_boom.py
index 4203110..432450c 100644
--- a/tests/pdp_api_v0/test_pz_ph_boom.py
+++ b/tests/pdp_api_v0/test_pz_ph_boom.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import uuid
 import cherrypy
 import pytest
 from cherrypy.test.helper import CPWebCase
-
 from policyhandler.config import Config
-from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID, Audit,
+from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID,
+                                      REQUEST_X_ONAP_REQUESTID, Audit,
                                       AuditHttpCode)
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME
 from policyhandler.policy_receiver import PolicyReceiver
@@ -81,10 +81,6 @@ class WebServerInternalBoom2018Test(CPWebCase):
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus(AuditHttpCode.SERVER_INTERNAL_ERROR.value)
 
         result = self.getPage("/healthcheck")
@@ -97,20 +93,18 @@ class WebServerInternalBoom2018Test(CPWebCase):
         match_to_policy_name = MockPolicyEngine2018.scope_prefix + "amet.*"
 
         body = json.dumps({POLICY_NAME: match_to_policy_name})
+        request_id = str(uuid.uuid4())
         result = self.getPage("/policies_latest", method='POST',
                               body=body,
                               headers=[
-                                  (REQUEST_X_ECOMP_REQUESTID, str(uuid.uuid4())),
+                                  (REQUEST_X_ECOMP_REQUESTID, request_id),
+                                  (REQUEST_X_ONAP_REQUESTID, request_id),
                                   ("Content-Type", "application/json"),
                                   ('Content-Length', str(len(body)))
                               ])
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus(AuditHttpCode.SERVER_INTERNAL_ERROR.value)
 
         result = self.getPage("/healthcheck")
@@ -121,10 +115,6 @@ class WebServerInternalBoom2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_policy_updates_and_catch_ups(self):
         """test run policy handler with policy updates and catchups"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start policy_updates_and_catch_ups")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_policy_updates_and_catch_ups",
@@ -153,10 +143,6 @@ class WebServerInternalBoom2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_catch_up_on_deploy_handler_changed(self):
         """test run policy handler with deployment-handler changed underneath"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start zzz_catch_up_on_deploy_handler_changed")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_catch_up_on_deploy_handler_changed",
@@ -192,10 +178,6 @@ class WebServerInternalBoom2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_get_catch_up(self):
         """test /catch_up"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start /catch_up")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_get_catch_up", req_message="start /catch_up")
@@ -249,8 +231,4 @@ class WebServerInternalBoom2018Test(CPWebCase):
         time.sleep(1)
         assert not PolicyReceiver.is_running()
 
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         Tracker.validate()