Refactoring existing integration tests

Change-Id: I1aedd94d5197b8c6513fc701e9df2aab4edec088
Issue-ID: POLICY-865
Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>

36 files changed, 0 insertions, 5662 deletions

diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem000.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem000.java
deleted file mode 100644
index 49e527822..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem000.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem000.
- */
-public class TestContextItem000 implements Serializable {
-    private static final int HASH_PRIME_1 = 31;
-    private static final int HASH_PRIME_2 = 1231;
-    private static final int HASH_PRIME_3 = 1237;
-
-    private static final long serialVersionUID = 7241008665286367796L;
-
-    private boolean flag = false;;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem000() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param flag the flag
-     */
-    public TestContextItem000(final Boolean flag) {
-        this.flag = flag;
-    }
-
-    /**
-     * Gets the flag.
-     *
-     * @return the flag
-     */
-    public boolean getFlag() {
-        return flag;
-    }
-
-    /**
-     * Sets the flag.
-     *
-     * @param flag the flag
-     */
-    public void setFlag(final boolean flag) {
-        this.flag = flag;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + (flag ? HASH_PRIME_2 : HASH_PRIME_3);
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem000 other = (TestContextItem000) obj;
-        if (flag != other.flag) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem000 [flag=" + flag + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem001.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem001.java
deleted file mode 100644
index 5d41269fe..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem001.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem001.
- */
-public class TestContextItem001 implements Serializable {
-    private static final long serialVersionUID = 1361938145823720386L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private byte byteValue = 0;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem001() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param byteValue the byte value
-     */
-    public TestContextItem001(final Byte byteValue) {
-        this.byteValue = byteValue;
-    }
-
-    /**
-     * Gets the byte value.
-     *
-     * @return the byte value
-     */
-    public byte getByteValue() {
-        return byteValue;
-    }
-
-    /**
-     * Sets the byte value.
-     *
-     * @param byteValue the byte value
-     */
-    public void setByteValue(final byte byteValue) {
-        this.byteValue = byteValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + byteValue;
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem001 other = (TestContextItem001) obj;
-        if (byteValue != other.byteValue) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem001 [byteValue=" + byteValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem002.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem002.java
deleted file mode 100644
index 3b5242f6b..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem002.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem002.
- */
-public class TestContextItem002 implements Serializable {
-    private static final long serialVersionUID = -8978435658277900984L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private int intValue = 0;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem002() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param intValue the int value
-     */
-    public TestContextItem002(final Integer intValue) {
-        this.intValue = intValue;
-    }
-
-    /**
-     * The Constructor.
-     *
-     * @param original the original
-     */
-    public TestContextItem002(final TestContextItem002 original) {
-        this.intValue = original.intValue;
-    }
-
-    /**
-     * Gets the int value.
-     *
-     * @return the int value
-     */
-    public int getIntValue() {
-        return intValue;
-    }
-
-    /**
-     * Sets the int value.
-     *
-     * @param intValue the int value
-     */
-    public void setIntValue(final int intValue) {
-        this.intValue = intValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + intValue;
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem002 other = (TestContextItem002) obj;
-        if (intValue != other.intValue) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem002 [intValue=" + intValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem003.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem003.java
deleted file mode 100644
index e7532ecd8..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem003.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem003.
- */
-public class TestContextItem003 implements Serializable {
-    private static final long serialVersionUID = 3599267534512489386L;
-
-    private static final int HASH_PRIME_1 = 31;
-    private static final int FOUR_BYTES = 33;
-
-    private long longValue = 0;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem003() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param longValue the long value
-     */
-    public TestContextItem003(final Long longValue) {
-        this.longValue = longValue;
-    }
-
-    /**
-     * Gets the long value.
-     *
-     * @return the long value
-     */
-    public long getLongValue() {
-        return longValue;
-    }
-
-    /**
-     * Sets the long value.
-     *
-     * @param longValue the long value
-     */
-    public void setLongValue(final long longValue) {
-        this.longValue = longValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + (int) (longValue ^ (longValue >>> FOUR_BYTES));
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem003 other = (TestContextItem003) obj;
-        if (longValue != other.longValue) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem003 [longValue=" + longValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem004.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem004.java
deleted file mode 100644
index 1370db17f..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem004.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem004.
- */
-public class TestContextItem004 implements Serializable {
-    private static final long serialVersionUID = -3359180576903272400L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private float floatValue = 0;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem004() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param floatValue the float value
-     */
-    public TestContextItem004(final Float floatValue) {
-        this.floatValue = floatValue;
-    }
-
-    /**
-     * Gets the float value.
-     *
-     * @return the float value
-     */
-    public float getFloatValue() {
-        return floatValue;
-    }
-
-    /**
-     * Sets the float value.
-     *
-     * @param floatValue the float value
-     */
-    public void setFloatValue(final float floatValue) {
-        this.floatValue = floatValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + Float.floatToIntBits(floatValue);
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem004 other = (TestContextItem004) obj;
-        if (Float.floatToIntBits(floatValue) != Float.floatToIntBits(other.floatValue)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem004 [floatValue=" + floatValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem005.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem005.java
deleted file mode 100644
index d8a3352ce..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem005.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem005.
- */
-public class TestContextItem005 implements Serializable {
-    private static final long serialVersionUID = -2958758261076734821L;
-
-    private static final int HASH_PRIME_1 = 31;
-    private static final int FOUR_BYTES = 32;
-
-    private double doubleValue = 0;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem005() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param doubleValue the double value
-     */
-    public TestContextItem005(final Double doubleValue) {
-        this.doubleValue = doubleValue;
-    }
-
-    /**
-     * Gets the double value.
-     *
-     * @return the double value
-     */
-    public double getDoubleValue() {
-        return doubleValue;
-    }
-
-    /**
-     * Sets the double value.
-     *
-     * @param doubleValue the double value
-     */
-    public void setDoubleValue(final double doubleValue) {
-        this.doubleValue = doubleValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        long temp;
-        temp = Double.doubleToLongBits(doubleValue);
-        result = prime * result + (int) (temp ^ (temp >>> FOUR_BYTES));
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem005 other = (TestContextItem005) obj;
-        if (Double.doubleToLongBits(doubleValue) != Double.doubleToLongBits(other.doubleValue)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem005 [doubleValue=" + doubleValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem006.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem006.java
deleted file mode 100644
index 5fd2f9d6b..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem006.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem006.
- */
-public class TestContextItem006 implements Serializable {
-    private static final long serialVersionUID = -1074772190611125121L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private String stringValue = "";
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem006() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param stringValue the string value
-     */
-    public TestContextItem006(final String stringValue) {
-        this.stringValue = stringValue;
-    }
-
-    /**
-     * Gets the string value.
-     *
-     * @return the string value
-     */
-    public String getStringValue() {
-        return stringValue;
-    }
-
-    /**
-     * Sets the string value.
-     *
-     * @param stringValue the string value
-     */
-    public void setStringValue(final String stringValue) {
-        this.stringValue = stringValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((stringValue == null) ? 0 : stringValue.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem006 other = (TestContextItem006) obj;
-        if (stringValue == null) {
-            if (other.stringValue != null) {
-                return false;
-            }
-        } else if (!stringValue.equals(other.stringValue)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem006 [stringValue=" + stringValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem007.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem007.java
deleted file mode 100644
index 21c6f8cdf..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem007.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestContextItem007.
- */
-public class TestContextItem007 implements Serializable {
-    private static final long serialVersionUID = -1029406737866392421L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private Long longValue = new Long(0);
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem007() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param longValue the long value
-     */
-    public TestContextItem007(final Long longValue) {
-        this.longValue = longValue;
-    }
-
-    /**
-     * Gets the long value.
-     *
-     * @return the long value
-     */
-    public Long getLongValue() {
-        return longValue;
-    }
-
-    /**
-     * Sets the long value.
-     *
-     * @param longValue the long value
-     */
-    public void setLongValue(final Long longValue) {
-        this.longValue = longValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((longValue == null) ? 0 : longValue.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem007 other = (TestContextItem007) obj;
-        if (longValue == null) {
-            if (other.longValue != null) {
-                return false;
-            }
-        } else if (!longValue.equals(other.longValue)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem007 [longValue=" + longValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem008.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem008.java
deleted file mode 100644
index 82a02a80e..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem008.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * The Class TestContextItem008.
- */
-public class TestContextItem008 implements Serializable {
-    private static final long serialVersionUID = -6984963129968805460L;
-
-    private static final int HASH_PRIME_1 = 31;
-    private static final int FOUR_BYTES = 32;
-
-    private long time;
-
-    private int year;
-    private int month;
-    private int day;
-    private int hour;
-    private int minute;
-    private int second;
-    private int milliSecond;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem008() {
-        this(new Date(System.currentTimeMillis()));
-    }
-
-    /**
-     * The Constructor.
-     *
-     * @param dateValue the date value
-     */
-    public TestContextItem008(final Date dateValue) {
-        setDateValue(dateValue.getTime());
-    }
-
-    /**
-     * The Constructor.
-     *
-     * @param time the time
-     */
-    public TestContextItem008(final long time) {
-        setDateValue(time);
-    }
-
-    /**
-     * Gets the time.
-     *
-     * @return the time
-     */
-    public long getTime() {
-        return time;
-    }
-
-    /**
-     * Gets the year.
-     *
-     * @return the year
-     */
-    public int getYear() {
-        return year;
-    }
-
-    /**
-     * Gets the month.
-     *
-     * @return the month
-     */
-    public int getMonth() {
-        return month;
-    }
-
-    /**
-     * Gets the day.
-     *
-     * @return the day
-     */
-    public int getDay() {
-        return day;
-    }
-
-    /**
-     * Gets the hour.
-     *
-     * @return the hour
-     */
-    public int getHour() {
-        return hour;
-    }
-
-    /**
-     * Gets the minute.
-     *
-     * @return the minute
-     */
-    public int getMinute() {
-        return minute;
-    }
-
-    /**
-     * Gets the second.
-     *
-     * @return the second
-     */
-    public int getSecond() {
-        return second;
-    }
-
-    /**
-     * Gets the milli second.
-     *
-     * @return the milli second
-     */
-    public int getMilliSecond() {
-        return milliSecond;
-    }
-
-    /**
-     * Gets the date value.
-     *
-     * @return the date value
-     */
-    public Date getDateValue() {
-        return new Date(time);
-    }
-
-    /**
-     * Sets the date value.
-     *
-     * @param dateValue the date value
-     */
-    public void setDateValue(final Date dateValue) {
-        setDateValue(dateValue.getTime());
-    }
-
-    /**
-     * Sets the date value.
-     *
-     * @param dateValue the date value
-     */
-    public void setDateValue(final long dateValue) {
-        this.time = dateValue;
-
-        final Calendar calendar = Calendar.getInstance();
-        calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
-        calendar.setTimeInMillis(time);
-
-        year = calendar.get(Calendar.YEAR);
-        month = calendar.get(Calendar.MONTH);
-        day = calendar.get(Calendar.DAY_OF_MONTH);
-        hour = calendar.get(Calendar.HOUR);
-        minute = calendar.get(Calendar.MINUTE);
-        second = calendar.get(Calendar.SECOND);
-        milliSecond = calendar.get(Calendar.MILLISECOND);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + day;
-        result = prime * result + hour;
-        result = prime * result + milliSecond;
-        result = prime * result + minute;
-        result = prime * result + month;
-        result = prime * result + second;
-        result = prime * result + (int) (time ^ (time >>> FOUR_BYTES));
-        result = prime * result + year;
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem008 other = (TestContextItem008) obj;
-        if (day != other.day) {
-            return false;
-        }
-        if (hour != other.hour) {
-            return false;
-        }
-        if (milliSecond != other.milliSecond) {
-            return false;
-        }
-        if (minute != other.minute) {
-            return false;
-        }
-        if (month != other.month) {
-            return false;
-        }
-        if (second != other.second) {
-            return false;
-        }
-        if (time != other.time) {
-            return false;
-        }
-        if (year != other.year) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem008 [time=" + time + ", year=" + year + ", month=" + month + ", day=" + day + ", hour="
-                + hour + ", minute=" + minute + ", second=" + second + ", milliSecond=" + milliSecond + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem009.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem009.java
deleted file mode 100644
index f3e89535f..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem009.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-import java.util.TimeZone;
-
-/**
- * The Class TestContextItem009.
- */
-public class TestContextItem009 implements Serializable {
-    private static final long serialVersionUID = 5604426823170331706L;
-
-    private static final int HASH_PRIME_1 = 31;
-    private static final int HASH_PRIME_2 = 1231;
-    private static final int HASH_PRIME_3 = 1237;
-
-    private TestContextItem008 dateValue = new TestContextItem008(System.currentTimeMillis());
-    private String timeZoneString = TimeZone.getTimeZone("Europe/Dublin").getDisplayName();
-    private boolean dst = false;
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem009() {
-        dst = true;
-    }
-
-    /**
-     * The Constructor.
-     *
-     * @param dateValue the date value
-     * @param tzValue the tz value
-     * @param dst the dst
-     */
-    public TestContextItem009(final TestContextItem008 dateValue, final String tzValue, final boolean dst) {
-        this.dateValue = dateValue;
-        this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName();
-        this.dst = dst;
-    }
-
-    /**
-     * The Constructor.
-     *
-     * @param original the original
-     */
-    public TestContextItem009(final TestContextItem009 original) {
-        this.dateValue = original.dateValue;
-        this.timeZoneString = original.timeZoneString;
-        this.dst = original.dst;
-    }
-
-    /**
-     * Gets the date value.
-     *
-     * @return the date value
-     */
-    public TestContextItem008 getDateValue() {
-        return dateValue;
-    }
-
-    /**
-     * Sets the date value.
-     *
-     * @param dateValue the date value
-     */
-    public void setDateValue(final TestContextItem008 dateValue) {
-        this.dateValue = dateValue;
-    }
-
-    /**
-     * Gets the TZ value.
-     *
-     * @return the TZ value
-     */
-    public String getTZValue() {
-        return timeZoneString;
-    }
-
-    /**
-     * Sets the TZ value.
-     *
-     * @param tzValue the TZ value
-     */
-    public void setTZValue(final String tzValue) {
-        this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName();
-    }
-
-    /**
-     * Gets the DST.
-     *
-     * @return the dst
-     */
-    public boolean getDST() {
-        return dst;
-    }
-
-    /**
-     * Sets the DST.
-     *
-     * @param newDst the dst
-     */
-    public void setDST(final boolean newDst) {
-        this.dst = newDst;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((dateValue == null) ? 0 : dateValue.hashCode());
-        result = prime * result + (dst ? HASH_PRIME_2 : HASH_PRIME_3);
-        result = prime * result + ((timeZoneString == null) ? 0 : timeZoneString.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem009 other = (TestContextItem009) obj;
-        if (dateValue == null) {
-            if (other.dateValue != null) {
-                return false;
-            }
-        } else if (!dateValue.equals(other.dateValue)) {
-            return false;
-        }
-        if (dst != other.dst) {
-            return false;
-        }
-        if (timeZoneString == null) {
-            if (other.timeZoneString != null) {
-                return false;
-            }
-        } else if (!timeZoneString.equals(other.timeZoneString)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem009 [dateValue=" + dateValue + ", tzValue=" + timeZoneString + ", dst=" + dst + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00A.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00A.java
deleted file mode 100644
index db380cc7a..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00A.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * The Class TestContextItem00A.
- */
-public class TestContextItem00A implements Serializable {
-    private static final long serialVersionUID = -6579903685538233754L;
-
-    private static final int HASH_PRIME_1 = 31;
-    private static final int HASH_PRIME_2 = 1231;
-    private static final int HASH_PRIME_3 = 1237;
-
-    private TestContextItem008 dateValue = new TestContextItem008(System.currentTimeMillis());
-    private String timeZoneString = TimeZone.getTimeZone("Europe/Dublin").getDisplayName();
-    private boolean dst = false;
-    private int utcOffset = 0;
-    private String localeLanguage = Locale.ENGLISH.getLanguage();
-    private String localeCountry = Locale.ENGLISH.getCountry();
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem00A() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param dateValue the date value
-     * @param tzValue the tz value
-     * @param dst the dst
-     * @param utcOffset the utc offset
-     * @param language the language
-     * @param country the country
-     */
-    public TestContextItem00A(final TestContextItem008 dateValue, final String tzValue, final boolean dst,
-            final int utcOffset, final String language, final String country) {
-        this.dateValue = dateValue;
-        this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName();
-        this.dst = dst;
-        this.utcOffset = utcOffset;
-
-        final Locale locale = new Locale(language, country);
-        this.localeLanguage = locale.getLanguage();
-        this.localeCountry = locale.getCountry();
-    }
-
-    /**
-     * The Constructor.
-     *
-     * @param original the original
-     */
-    public TestContextItem00A(final TestContextItem00A original) {
-        this.dateValue = original.dateValue;
-        this.timeZoneString = TimeZone.getTimeZone(original.timeZoneString).getDisplayName();
-        this.dst = original.dst;
-        this.utcOffset = original.utcOffset;
-
-        final Locale locale = new Locale(original.localeLanguage, original.localeCountry);
-        this.localeLanguage = locale.getLanguage();
-        this.localeCountry = locale.getCountry();
-    }
-
-    /**
-     * Gets the date value.
-     *
-     * @return the date value
-     */
-    public TestContextItem008 getDateValue() {
-        return dateValue;
-    }
-
-    /**
-     * Sets the date value.
-     *
-     * @param dateValue the date value
-     */
-    public void setDateValue(final TestContextItem008 dateValue) {
-        this.dateValue = dateValue;
-    }
-
-    /**
-     * Gets the TZ value.
-     *
-     * @return the TZ value
-     */
-    public String getTZValue() {
-        return timeZoneString;
-    }
-
-    /**
-     * Sets the TZ value.
-     *
-     * @param tzValue the TZ value
-     */
-    public void setTZValue(final String tzValue) {
-        this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName();
-    }
-
-    /**
-     * Gets the DST.
-     *
-     * @return the dst
-     */
-    public boolean getDST() {
-        return dst;
-    }
-
-    /**
-     * Sets the DST.
-     *
-     * @param newDst the dst
-     */
-    public void setDST(final boolean newDst) {
-        this.dst = newDst;
-    }
-
-    /**
-     * Gets the UTC offset.
-     *
-     * @return the UTC offset
-     */
-    public int getUTCOffset() {
-        return utcOffset;
-    }
-
-    /**
-     * Sets the UTC offset.
-     *
-     * @param newUtcOffset the UTC offset
-     */
-    public void setUTCOffset(final int newUtcOffset) {
-        this.utcOffset = newUtcOffset;
-    }
-
-    /**
-     * Gets the locale.
-     *
-     * @return the locale
-     */
-    public Locale getLocale() {
-        return new Locale(localeLanguage, localeCountry);
-    }
-
-    /**
-     * Sets the locale.
-     *
-     * @param locale the locale
-     */
-    public void setLocale(final Locale locale) {
-        this.localeLanguage = locale.getLanguage();
-        this.localeCountry = locale.getCountry();
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((dateValue == null) ? 0 : dateValue.hashCode());
-        result = prime * result + (dst ? HASH_PRIME_2 : HASH_PRIME_3);
-        result = prime * result + ((localeCountry == null) ? 0 : localeCountry.hashCode());
-        result = prime * result + ((localeLanguage == null) ? 0 : localeLanguage.hashCode());
-        result = prime * result + ((timeZoneString == null) ? 0 : timeZoneString.hashCode());
-        result = prime * result + utcOffset;
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem00A other = (TestContextItem00A) obj;
-        if (dateValue == null) {
-            if (other.dateValue != null) {
-                return false;
-            }
-        } else if (!dateValue.equals(other.dateValue)) {
-            return false;
-        }
-        if (dst != other.dst) {
-            return false;
-        }
-        if (localeCountry == null) {
-            if (other.localeCountry != null) {
-                return false;
-            }
-        } else if (!localeCountry.equals(other.localeCountry)) {
-            return false;
-        }
-        if (localeLanguage == null) {
-            if (other.localeLanguage != null) {
-                return false;
-            }
-        } else if (!localeLanguage.equals(other.localeLanguage)) {
-            return false;
-        }
-        if (timeZoneString == null) {
-            if (other.timeZoneString != null) {
-                return false;
-            }
-        } else if (!timeZoneString.equals(other.timeZoneString)) {
-            return false;
-        }
-        if (utcOffset != other.utcOffset) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem00A [dateValue=" + dateValue + ", timeZoneString=" + timeZoneString + ", dst=" + dst
-                + ", utcOffset=" + utcOffset + ", localeLanguage=" + localeLanguage + ", localeCountry=" + localeCountry
-                + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00B.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00B.java
deleted file mode 100644
index 4990b1b9e..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00B.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * The Class TestContextItem00B.
- */
-public class TestContextItem00B implements Serializable {
-    private static final long serialVersionUID = 1254589722957250388L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private TreeSet<String> setValue = new TreeSet<String>();
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem00B() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param setArray the set array
-     */
-    public TestContextItem00B(final String[] setArray) {}
-
-    /**
-     * The Constructor.
-     *
-     * @param setValue the set value
-     */
-    public TestContextItem00B(final TreeSet<String> setValue) {
-        this.setValue = setValue;
-    }
-
-    /**
-     * Gets the set value.
-     *
-     * @return the sets the value
-     */
-    public Set<String> getSetValue() {
-        if (setValue == null) {
-            setValue = new TreeSet<String>();
-        }
-        return setValue;
-    }
-
-    /**
-     * Sets the set value.
-     *
-     * @param setValue the sets the value
-     */
-    public void setSetValue(final TreeSet<String> setValue) {
-        this.setValue = setValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((setValue == null) ? 0 : setValue.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem00B other = (TestContextItem00B) obj;
-        if (setValue == null) {
-            if (other.setValue != null) {
-                return false;
-            }
-        } else if (!setValue.equals(other.setValue)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem00B [setValue=" + setValue + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00C.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00C.java
deleted file mode 100644
index 6c912977a..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextItem00C.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * The Class TestContextItem00C.
- */
-public class TestContextItem00C implements Serializable {
-    private static final long serialVersionUID = -7497746259264651884L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private Map<String, String> mapValue = new TreeMap<String, String>();
-
-    /**
-     * The Constructor.
-     */
-    public TestContextItem00C() {}
-
-    /**
-     * The Constructor.
-     *
-     * @param mapValue the map value
-     */
-    public TestContextItem00C(final Map<String, String> mapValue) {
-        this.mapValue = mapValue;
-    }
-
-    /**
-     * Gets the map value.
-     *
-     * @return the map value
-     */
-    public Map<String, String> getMapValue() {
-        if (mapValue == null) {
-            mapValue = new TreeMap<String, String>();
-        }
-        return mapValue;
-    }
-
-    /**
-     * Sets the map value.
-     *
-     * @param mapValue the map value
-     */
-    public void setMapValue(final Map<String, String> mapValue) {
-        this.mapValue = mapValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((mapValue == null) ? 0 : mapValue.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestContextItem00C other = (TestContextItem00C) obj;
-        if (mapValue == null) {
-            if (other.mapValue != null) {
-                return false;
-            }
-        } else if (!mapValue.equals(other.mapValue)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestContextItem00C [mapValue=" + mapValue + "]";
-    }
-
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java
deleted file mode 100644
index 11a1af1e3..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestExternalContextItem.
- */
-public class TestExternalContextItem implements Serializable {
-    private static final long serialVersionUID = 3512435733818672173L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private TestContextItem000 testExternalContextItem000;
-    private TestContextItem001 testExternalContextItem001;
-    private TestContextItem002 testExternalContextItem002;
-    private TestContextItem003 testExternalContextItem003;
-    private TestContextItem004 testExternalContextItem004;
-    private TestContextItem005 testExternalContextItem005;
-    private TestContextItem006 testExternalContextItem006;
-    private TestContextItem007 testExternalContextItem007;
-    private TestContextItem008 testExternalContextItem008;
-    private TestContextItem009 testExternalContextItem009;
-    private TestContextItem00A testExternalContextItem00A;
-    private TestContextItem00B testExternalContextItem00B;
-    private TestContextItem00C testExternalContextItem00C;
-
-    /**
-     * Gets the test external context item 000.
-     *
-     * @return the test external context item 000
-     */
-    public TestContextItem000 getTestExternalContextItem000() {
-        return testExternalContextItem000;
-    }
-
-    /**
-     * Sets the test external context item 000.
-     *
-     * @param testExternalContextItem000 the test external context item 000
-     */
-    public void setTestExternalContextItem000(final TestContextItem000 testExternalContextItem000) {
-        this.testExternalContextItem000 = testExternalContextItem000;
-    }
-
-    /**
-     * Gets the test external context item 001.
-     *
-     * @return the test external context item 001
-     */
-    public TestContextItem001 getTestExternalContextItem001() {
-        return testExternalContextItem001;
-    }
-
-    /**
-     * Sets the test external context item 001.
-     *
-     * @param testExternalContextItem001 the test external context item 001
-     */
-    public void setTestExternalContextItem001(final TestContextItem001 testExternalContextItem001) {
-        this.testExternalContextItem001 = testExternalContextItem001;
-    }
-
-    /**
-     * Gets the test external context item 002.
-     *
-     * @return the test external context item 002
-     */
-    public TestContextItem002 getTestExternalContextItem002() {
-        return testExternalContextItem002;
-    }
-
-    /**
-     * Sets the test external context item 002.
-     *
-     * @param testExternalContextItem002 the test external context item 002
-     */
-    public void setTestExternalContextItem002(final TestContextItem002 testExternalContextItem002) {
-        this.testExternalContextItem002 = testExternalContextItem002;
-    }
-
-    /**
-     * Gets the test external context item 003.
-     *
-     * @return the test external context item 003
-     */
-    public TestContextItem003 getTestExternalContextItem003() {
-        return testExternalContextItem003;
-    }
-
-    /**
-     * Sets the test external context item 003.
-     *
-     * @param testExternalContextItem003 the test external context item 003
-     */
-    public void setTestExternalContextItem003(final TestContextItem003 testExternalContextItem003) {
-        this.testExternalContextItem003 = testExternalContextItem003;
-    }
-
-    /**
-     * Gets the test external context item 004.
-     *
-     * @return the test external context item 004
-     */
-    public TestContextItem004 getTestExternalContextItem004() {
-        return testExternalContextItem004;
-    }
-
-    /**
-     * Sets the test external context item 004.
-     *
-     * @param testExternalContextItem004 the test external context item 004
-     */
-    public void setTestExternalContextItem004(final TestContextItem004 testExternalContextItem004) {
-        this.testExternalContextItem004 = testExternalContextItem004;
-    }
-
-    /**
-     * Gets the test external context item 005.
-     *
-     * @return the test external context item 005
-     */
-    public TestContextItem005 getTestExternalContextItem005() {
-        return testExternalContextItem005;
-    }
-
-    /**
-     * Sets the test external context item 005.
-     *
-     * @param testExternalContextItem005 the test external context item 005
-     */
-    public void setTestExternalContextItem005(final TestContextItem005 testExternalContextItem005) {
-        this.testExternalContextItem005 = testExternalContextItem005;
-    }
-
-    /**
-     * Gets the test external context item 006.
-     *
-     * @return the test external context item 006
-     */
-    public TestContextItem006 getTestExternalContextItem006() {
-        return testExternalContextItem006;
-    }
-
-    /**
-     * Sets the test external context item 006.
-     *
-     * @param testExternalContextItem006 the test external context item 006
-     */
-    public void setTestExternalContextItem006(final TestContextItem006 testExternalContextItem006) {
-        this.testExternalContextItem006 = testExternalContextItem006;
-    }
-
-    /**
-     * Gets the test external context item 007.
-     *
-     * @return the test external context item 007
-     */
-    public TestContextItem007 getTestExternalContextItem007() {
-        return testExternalContextItem007;
-    }
-
-    /**
-     * Sets the test external context item 007.
-     *
-     * @param testExternalContextItem007 the test external context item 007
-     */
-    public void setTestExternalContextItem007(final TestContextItem007 testExternalContextItem007) {
-        this.testExternalContextItem007 = testExternalContextItem007;
-    }
-
-    /**
-     * Gets the test external context item 008.
-     *
-     * @return the test external context item 008
-     */
-    public TestContextItem008 getTestExternalContextItem008() {
-        return testExternalContextItem008;
-    }
-
-    /**
-     * Sets the test external context item 008.
-     *
-     * @param testExternalContextItem008 the test external context item 008
-     */
-    public void setTestExternalContextItem008(final TestContextItem008 testExternalContextItem008) {
-        this.testExternalContextItem008 = testExternalContextItem008;
-    }
-
-    /**
-     * Gets the test external context item 009.
-     *
-     * @return the test external context item 009
-     */
-    public TestContextItem009 getTestExternalContextItem009() {
-        return testExternalContextItem009;
-    }
-
-    /**
-     * Sets the test external context item 009.
-     *
-     * @param testExternalContextItem009 the test external context item 009
-     */
-    public void setTestExternalContextItem009(final TestContextItem009 testExternalContextItem009) {
-        this.testExternalContextItem009 = testExternalContextItem009;
-    }
-
-    /**
-     * Gets the test external context item 00 A.
-     *
-     * @return the test external context item 00 A
-     */
-    public TestContextItem00A getTestExternalContextItem00A() {
-        return testExternalContextItem00A;
-    }
-
-    /**
-     * Sets the test external context item 00 A.
-     *
-     * @param testExternalContextItem00A the test external context item 00 A
-     */
-    public void setTestExternalContextItem00A(final TestContextItem00A testExternalContextItem00A) {
-        this.testExternalContextItem00A = testExternalContextItem00A;
-    }
-
-    /**
-     * Gets the test external context item 00 B.
-     *
-     * @return the test external context item 00 B
-     */
-    public TestContextItem00B getTestExternalContextItem00B() {
-        return testExternalContextItem00B;
-    }
-
-    /**
-     * Sets the test external context item 00 B.
-     *
-     * @param testExternalContextItem00B the test external context item 00 B
-     */
-    public void setTestExternalContextItem00B(final TestContextItem00B testExternalContextItem00B) {
-        this.testExternalContextItem00B = testExternalContextItem00B;
-    }
-
-    /**
-     * Gets the test external context item 00 C.
-     *
-     * @return the test external context item 00 C
-     */
-    public TestContextItem00C getTestExternalContextItem00C() {
-        return testExternalContextItem00C;
-    }
-
-    /**
-     * Sets the test external context item 00 C.
-     *
-     * @param testExternalContextItem00C the test external context item 00 C
-     */
-    public void setTestExternalContextItem00C(final TestContextItem00C testExternalContextItem00C) {
-        this.testExternalContextItem00C = testExternalContextItem00C;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((testExternalContextItem000 == null) ? 0 : testExternalContextItem000.hashCode());
-        result = prime * result + ((testExternalContextItem001 == null) ? 0 : testExternalContextItem001.hashCode());
-        result = prime * result + ((testExternalContextItem002 == null) ? 0 : testExternalContextItem002.hashCode());
-        result = prime * result + ((testExternalContextItem003 == null) ? 0 : testExternalContextItem003.hashCode());
-        result = prime * result + ((testExternalContextItem004 == null) ? 0 : testExternalContextItem004.hashCode());
-        result = prime * result + ((testExternalContextItem005 == null) ? 0 : testExternalContextItem005.hashCode());
-        result = prime * result + ((testExternalContextItem006 == null) ? 0 : testExternalContextItem006.hashCode());
-        result = prime * result + ((testExternalContextItem007 == null) ? 0 : testExternalContextItem007.hashCode());
-        result = prime * result + ((testExternalContextItem008 == null) ? 0 : testExternalContextItem008.hashCode());
-        result = prime * result + ((testExternalContextItem009 == null) ? 0 : testExternalContextItem009.hashCode());
-        result = prime * result + ((testExternalContextItem00A == null) ? 0 : testExternalContextItem00A.hashCode());
-        result = prime * result + ((testExternalContextItem00B == null) ? 0 : testExternalContextItem00B.hashCode());
-        result = prime * result + ((testExternalContextItem00C == null) ? 0 : testExternalContextItem00C.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestExternalContextItem other = (TestExternalContextItem) obj;
-        if (testExternalContextItem000 == null) {
-            if (other.testExternalContextItem000 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem000.equals(other.testExternalContextItem000)) {
-            return false;
-        }
-        if (testExternalContextItem001 == null) {
-            if (other.testExternalContextItem001 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem001.equals(other.testExternalContextItem001)) {
-            return false;
-        }
-        if (testExternalContextItem002 == null) {
-            if (other.testExternalContextItem002 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem002.equals(other.testExternalContextItem002)) {
-            return false;
-        }
-        if (testExternalContextItem003 == null) {
-            if (other.testExternalContextItem003 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem003.equals(other.testExternalContextItem003)) {
-            return false;
-        }
-        if (testExternalContextItem004 == null) {
-            if (other.testExternalContextItem004 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem004.equals(other.testExternalContextItem004)) {
-            return false;
-        }
-        if (testExternalContextItem005 == null) {
-            if (other.testExternalContextItem005 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem005.equals(other.testExternalContextItem005)) {
-            return false;
-        }
-        if (testExternalContextItem006 == null) {
-            if (other.testExternalContextItem006 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem006.equals(other.testExternalContextItem006)) {
-            return false;
-        }
-        if (testExternalContextItem007 == null) {
-            if (other.testExternalContextItem007 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem007.equals(other.testExternalContextItem007)) {
-            return false;
-        }
-        if (testExternalContextItem008 == null) {
-            if (other.testExternalContextItem008 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem008.equals(other.testExternalContextItem008)) {
-            return false;
-        }
-        if (testExternalContextItem009 == null) {
-            if (other.testExternalContextItem009 != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem009.equals(other.testExternalContextItem009)) {
-            return false;
-        }
-        if (testExternalContextItem00A == null) {
-            if (other.testExternalContextItem00A != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem00A.equals(other.testExternalContextItem00A)) {
-            return false;
-        }
-        if (testExternalContextItem00B == null) {
-            if (other.testExternalContextItem00B != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem00B.equals(other.testExternalContextItem00B)) {
-            return false;
-        }
-        if (testExternalContextItem00C == null) {
-            if (other.testExternalContextItem00C != null) {
-                return false;
-            }
-        } else if (!testExternalContextItem00C.equals(other.testExternalContextItem00C)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestExternalContextItem [testExternalContextItem000=" + testExternalContextItem000
-                + ", testExternalContextItem001=" + testExternalContextItem001 + ", testExternalContextItem002="
-                + testExternalContextItem002 + ", testExternalContextItem003=" + testExternalContextItem003
-                + ", testExternalContextItem004=" + testExternalContextItem004 + ", testExternalContextItem005="
-                + testExternalContextItem005 + ", testExternalContextItem006=" + testExternalContextItem006
-                + ", testExternalContextItem007=" + testExternalContextItem007 + ", testExternalContextItem008="
-                + testExternalContextItem008 + ", testExternalContextItem009=" + testExternalContextItem009
-                + ", testExternalContextItem00A=" + testExternalContextItem00A + ", testExternalContextItem00B="
-                + testExternalContextItem00B + ", testExternalContextItem00C=" + testExternalContextItem00C + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java
deleted file mode 100644
index 2e893d980..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestGlobalContextItem.
- */
-public class TestGlobalContextItem implements Serializable {
-    private static final long serialVersionUID = 3348445332683174361L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private TestContextItem000 testGlobalContextItem000;
-    private TestContextItem001 testGlobalContextItem001;
-    private TestContextItem002 testGlobalContextItem002;
-    private TestContextItem003 testGlobalContextItem003;
-    private TestContextItem004 testGlobalContextItem004;
-    private TestContextItem005 testGlobalContextItem005;
-    private TestContextItem006 testGlobalContextItem006;
-    private TestContextItem007 testGlobalContextItem007;
-    private TestContextItem008 testGlobalContextItem008;
-    private TestContextItem009 testGlobalContextItem009;
-    private TestContextItem00A testGlobalContextItem00A;
-    private TestContextItem00B testGlobalContextItem00B;
-    private TestContextItem00C testGlobalContextItem00C;
-
-    /**
-     * Gets the test global context item 000.
-     *
-     * @return the test global context item 000
-     */
-    public TestContextItem000 getTestGlobalContextItem000() {
-        return testGlobalContextItem000;
-    }
-
-    /**
-     * Sets the test global context item 000.
-     *
-     * @param testGlobalContextItem000 the test global context item 000
-     */
-    public void setTestGlobalContextItem000(final TestContextItem000 testGlobalContextItem000) {
-        this.testGlobalContextItem000 = testGlobalContextItem000;
-    }
-
-    /**
-     * Gets the test global context item 001.
-     *
-     * @return the test global context item 001
-     */
-    public TestContextItem001 getTestGlobalContextItem001() {
-        return testGlobalContextItem001;
-    }
-
-    /**
-     * Sets the test global context item 001.
-     *
-     * @param testGlobalContextItem001 the test global context item 001
-     */
-    public void setTestGlobalContextItem001(final TestContextItem001 testGlobalContextItem001) {
-        this.testGlobalContextItem001 = testGlobalContextItem001;
-    }
-
-    /**
-     * Gets the test global context item 002.
-     *
-     * @return the test global context item 002
-     */
-    public TestContextItem002 getTestGlobalContextItem002() {
-        return testGlobalContextItem002;
-    }
-
-    /**
-     * Sets the test global context item 002.
-     *
-     * @param testGlobalContextItem002 the test global context item 002
-     */
-    public void setTestGlobalContextItem002(final TestContextItem002 testGlobalContextItem002) {
-        this.testGlobalContextItem002 = testGlobalContextItem002;
-    }
-
-    /**
-     * Gets the test global context item 003.
-     *
-     * @return the test global context item 003
-     */
-    public TestContextItem003 getTestGlobalContextItem003() {
-        return testGlobalContextItem003;
-    }
-
-    /**
-     * Sets the test global context item 003.
-     *
-     * @param testGlobalContextItem003 the test global context item 003
-     */
-    public void setTestGlobalContextItem003(final TestContextItem003 testGlobalContextItem003) {
-        this.testGlobalContextItem003 = testGlobalContextItem003;
-    }
-
-    /**
-     * Gets the test global context item 004.
-     *
-     * @return the test global context item 004
-     */
-    public TestContextItem004 getTestGlobalContextItem004() {
-        return testGlobalContextItem004;
-    }
-
-    /**
-     * Sets the test global context item 004.
-     *
-     * @param testGlobalContextItem004 the test global context item 004
-     */
-    public void setTestGlobalContextItem004(final TestContextItem004 testGlobalContextItem004) {
-        this.testGlobalContextItem004 = testGlobalContextItem004;
-    }
-
-    /**
-     * Gets the test global context item 005.
-     *
-     * @return the test global context item 005
-     */
-    public TestContextItem005 getTestGlobalContextItem005() {
-        return testGlobalContextItem005;
-    }
-
-    /**
-     * Sets the test global context item 005.
-     *
-     * @param testGlobalContextItem005 the test global context item 005
-     */
-    public void setTestGlobalContextItem005(final TestContextItem005 testGlobalContextItem005) {
-        this.testGlobalContextItem005 = testGlobalContextItem005;
-    }
-
-    /**
-     * Gets the test global context item 006.
-     *
-     * @return the test global context item 006
-     */
-    public TestContextItem006 getTestGlobalContextItem006() {
-        return testGlobalContextItem006;
-    }
-
-    /**
-     * Sets the test global context item 006.
-     *
-     * @param testGlobalContextItem006 the test global context item 006
-     */
-    public void setTestGlobalContextItem006(final TestContextItem006 testGlobalContextItem006) {
-        this.testGlobalContextItem006 = testGlobalContextItem006;
-    }
-
-    /**
-     * Gets the test global context item 007.
-     *
-     * @return the test global context item 007
-     */
-    public TestContextItem007 getTestGlobalContextItem007() {
-        return testGlobalContextItem007;
-    }
-
-    /**
-     * Sets the test global context item 007.
-     *
-     * @param testGlobalContextItem007 the test global context item 007
-     */
-    public void setTestGlobalContextItem007(final TestContextItem007 testGlobalContextItem007) {
-        this.testGlobalContextItem007 = testGlobalContextItem007;
-    }
-
-    /**
-     * Gets the test global context item 008.
-     *
-     * @return the test global context item 008
-     */
-    public TestContextItem008 getTestGlobalContextItem008() {
-        return testGlobalContextItem008;
-    }
-
-    /**
-     * Sets the test global context item 008.
-     *
-     * @param testGlobalContextItem008 the test global context item 008
-     */
-    public void setTestGlobalContextItem008(final TestContextItem008 testGlobalContextItem008) {
-        this.testGlobalContextItem008 = testGlobalContextItem008;
-    }
-
-    /**
-     * Gets the test global context item 009.
-     *
-     * @return the test global context item 009
-     */
-    public TestContextItem009 getTestGlobalContextItem009() {
-        return testGlobalContextItem009;
-    }
-
-    /**
-     * Sets the test global context item 009.
-     *
-     * @param testGlobalContextItem009 the test global context item 009
-     */
-    public void setTestGlobalContextItem009(final TestContextItem009 testGlobalContextItem009) {
-        this.testGlobalContextItem009 = testGlobalContextItem009;
-    }
-
-    /**
-     * Gets the test global context item 00 A.
-     *
-     * @return the test global context item 00 A
-     */
-    public TestContextItem00A getTestGlobalContextItem00A() {
-        return testGlobalContextItem00A;
-    }
-
-    /**
-     * Sets the test global context item 00 A.
-     *
-     * @param testGlobalContextItem00A the test global context item 00 A
-     */
-    public void setTestGlobalContextItem00A(final TestContextItem00A testGlobalContextItem00A) {
-        this.testGlobalContextItem00A = testGlobalContextItem00A;
-    }
-
-    /**
-     * Gets the test global context item 00 B.
-     *
-     * @return the test global context item 00 B
-     */
-    public TestContextItem00B getTestGlobalContextItem00B() {
-        return testGlobalContextItem00B;
-    }
-
-    /**
-     * Sets the test global context item 00 B.
-     *
-     * @param testGlobalContextItem00B the test global context item 00 B
-     */
-    public void setTestGlobalContextItem00B(final TestContextItem00B testGlobalContextItem00B) {
-        this.testGlobalContextItem00B = testGlobalContextItem00B;
-    }
-
-    /**
-     * Gets the test global context item 00 C.
-     *
-     * @return the test global context item 00 C
-     */
-    public TestContextItem00C getTestGlobalContextItem00C() {
-        return testGlobalContextItem00C;
-    }
-
-    /**
-     * Sets the test global context item 00 C.
-     *
-     * @param testGlobalContextItem00C the test global context item 00 C
-     */
-    public void setTestGlobalContextItem00C(final TestContextItem00C testGlobalContextItem00C) {
-        this.testGlobalContextItem00C = testGlobalContextItem00C;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((testGlobalContextItem000 == null) ? 0 : testGlobalContextItem000.hashCode());
-        result = prime * result + ((testGlobalContextItem001 == null) ? 0 : testGlobalContextItem001.hashCode());
-        result = prime * result + ((testGlobalContextItem002 == null) ? 0 : testGlobalContextItem002.hashCode());
-        result = prime * result + ((testGlobalContextItem003 == null) ? 0 : testGlobalContextItem003.hashCode());
-        result = prime * result + ((testGlobalContextItem004 == null) ? 0 : testGlobalContextItem004.hashCode());
-        result = prime * result + ((testGlobalContextItem005 == null) ? 0 : testGlobalContextItem005.hashCode());
-        result = prime * result + ((testGlobalContextItem006 == null) ? 0 : testGlobalContextItem006.hashCode());
-        result = prime * result + ((testGlobalContextItem007 == null) ? 0 : testGlobalContextItem007.hashCode());
-        result = prime * result + ((testGlobalContextItem008 == null) ? 0 : testGlobalContextItem008.hashCode());
-        result = prime * result + ((testGlobalContextItem009 == null) ? 0 : testGlobalContextItem009.hashCode());
-        result = prime * result + ((testGlobalContextItem00A == null) ? 0 : testGlobalContextItem00A.hashCode());
-        result = prime * result + ((testGlobalContextItem00B == null) ? 0 : testGlobalContextItem00B.hashCode());
-        result = prime * result + ((testGlobalContextItem00C == null) ? 0 : testGlobalContextItem00C.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestGlobalContextItem other = (TestGlobalContextItem) obj;
-        if (testGlobalContextItem000 == null) {
-            if (other.testGlobalContextItem000 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem000.equals(other.testGlobalContextItem000)) {
-            return false;
-        }
-        if (testGlobalContextItem001 == null) {
-            if (other.testGlobalContextItem001 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem001.equals(other.testGlobalContextItem001)) {
-            return false;
-        }
-        if (testGlobalContextItem002 == null) {
-            if (other.testGlobalContextItem002 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem002.equals(other.testGlobalContextItem002)) {
-            return false;
-        }
-        if (testGlobalContextItem003 == null) {
-            if (other.testGlobalContextItem003 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem003.equals(other.testGlobalContextItem003)) {
-            return false;
-        }
-        if (testGlobalContextItem004 == null) {
-            if (other.testGlobalContextItem004 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem004.equals(other.testGlobalContextItem004)) {
-            return false;
-        }
-        if (testGlobalContextItem005 == null) {
-            if (other.testGlobalContextItem005 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem005.equals(other.testGlobalContextItem005)) {
-            return false;
-        }
-        if (testGlobalContextItem006 == null) {
-            if (other.testGlobalContextItem006 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem006.equals(other.testGlobalContextItem006)) {
-            return false;
-        }
-        if (testGlobalContextItem007 == null) {
-            if (other.testGlobalContextItem007 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem007.equals(other.testGlobalContextItem007)) {
-            return false;
-        }
-        if (testGlobalContextItem008 == null) {
-            if (other.testGlobalContextItem008 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem008.equals(other.testGlobalContextItem008)) {
-            return false;
-        }
-        if (testGlobalContextItem009 == null) {
-            if (other.testGlobalContextItem009 != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem009.equals(other.testGlobalContextItem009)) {
-            return false;
-        }
-        if (testGlobalContextItem00A == null) {
-            if (other.testGlobalContextItem00A != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem00A.equals(other.testGlobalContextItem00A)) {
-            return false;
-        }
-        if (testGlobalContextItem00B == null) {
-            if (other.testGlobalContextItem00B != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem00B.equals(other.testGlobalContextItem00B)) {
-            return false;
-        }
-        if (testGlobalContextItem00C == null) {
-            if (other.testGlobalContextItem00C != null) {
-                return false;
-            }
-        } else if (!testGlobalContextItem00C.equals(other.testGlobalContextItem00C)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestGlobalContextItem [testGlobalContextItem000=" + testGlobalContextItem000
-                + ", testGlobalContextItem001=" + testGlobalContextItem001 + ", testGlobalContextItem002="
-                + testGlobalContextItem002 + ", testGlobalContextItem003=" + testGlobalContextItem003
-                + ", testGlobalContextItem004=" + testGlobalContextItem004 + ", testGlobalContextItem005="
-                + testGlobalContextItem005 + ", testGlobalContextItem006=" + testGlobalContextItem006
-                + ", testGlobalContextItem007=" + testGlobalContextItem007 + ", testGlobalContextItem008="
-                + testGlobalContextItem008 + ", testGlobalContextItem009=" + testGlobalContextItem009
-                + ", testGlobalContextItem00A=" + testGlobalContextItem00A + ", testGlobalContextItem00B="
-                + testGlobalContextItem00B + ", testGlobalContextItem00C=" + testGlobalContextItem00C + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java
deleted file mode 100644
index e9381ded4..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.concepts;
-
-import java.io.Serializable;
-
-/**
- * The Class TestPolicyContextItem.
- */
-public class TestPolicyContextItem implements Serializable {
-    private static final long serialVersionUID = 6336372857646152910L;
-
-    private static final int HASH_PRIME_1 = 31;
-
-    private TestContextItem006 testPolicyContextItem000;
-    private TestContextItem003 testPolicyContextItem001;
-    private TestContextItem005 testPolicyContextItem002;
-    private TestContextItem000 testPolicyContextItem003;
-    private TestContextItem003 testPolicyContextItem004;
-    private TestContextItem00C testPolicyContextItem005;
-
-    /**
-     * Gets the test policy context item 000.
-     *
-     * @return the test policy context item 000
-     */
-    public TestContextItem006 getTestPolicyContextItem000() {
-        return testPolicyContextItem000;
-    }
-
-    /**
-     * Sets the test policy context item 000.
-     *
-     * @param testPolicyContextItem000 the test policy context item 000
-     */
-    public void setTestPolicyContextItem000(final TestContextItem006 testPolicyContextItem000) {
-        this.testPolicyContextItem000 = testPolicyContextItem000;
-    }
-
-    /**
-     * Gets the test policy context item 001.
-     *
-     * @return the test policy context item 001
-     */
-    public TestContextItem003 getTestPolicyContextItem001() {
-        return testPolicyContextItem001;
-    }
-
-    /**
-     * Sets the test policy context item 001.
-     *
-     * @param testPolicyContextItem001 the test policy context item 001
-     */
-    public void setTestPolicyContextItem001(final TestContextItem003 testPolicyContextItem001) {
-        this.testPolicyContextItem001 = testPolicyContextItem001;
-    }
-
-    /**
-     * Gets the test policy context item 002.
-     *
-     * @return the test policy context item 002
-     */
-    public TestContextItem005 getTestPolicyContextItem002() {
-        return testPolicyContextItem002;
-    }
-
-    /**
-     * Sets the test policy context item 002.
-     *
-     * @param testPolicyContextItem002 the test policy context item 002
-     */
-    public void setTestPolicyContextItem002(final TestContextItem005 testPolicyContextItem002) {
-        this.testPolicyContextItem002 = testPolicyContextItem002;
-    }
-
-    /**
-     * Gets the test policy context item 003.
-     *
-     * @return the test policy context item 003
-     */
-    public TestContextItem000 getTestPolicyContextItem003() {
-        return testPolicyContextItem003;
-    }
-
-    /**
-     * Sets the test policy context item 003.
-     *
-     * @param testPolicyContextItem003 the test policy context item 003
-     */
-    public void setTestPolicyContextItem003(final TestContextItem000 testPolicyContextItem003) {
-        this.testPolicyContextItem003 = testPolicyContextItem003;
-    }
-
-    /**
-     * Gets the test policy context item 004.
-     *
-     * @return the test policy context item 004
-     */
-    public TestContextItem003 getTestPolicyContextItem004() {
-        return testPolicyContextItem004;
-    }
-
-    /**
-     * Sets the test policy context item 004.
-     *
-     * @param testPolicyContextItem004 the test policy context item 004
-     */
-    public void setTestPolicyContextItem004(final TestContextItem003 testPolicyContextItem004) {
-        this.testPolicyContextItem004 = testPolicyContextItem004;
-    }
-
-    /**
-     * Gets the test policy context item 005.
-     *
-     * @return the test policy context item 005
-     */
-    public TestContextItem00C getTestPolicyContextItem005() {
-        return testPolicyContextItem005;
-    }
-
-    /**
-     * Sets the test policy context item 005.
-     *
-     * @param testPolicyContextItem005 the test policy context item 005
-     */
-    public void setTestPolicyContextItem005(final TestContextItem00C testPolicyContextItem005) {
-        this.testPolicyContextItem005 = testPolicyContextItem005;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = HASH_PRIME_1;
-        int result = 1;
-        result = prime * result + ((testPolicyContextItem000 == null) ? 0 : testPolicyContextItem000.hashCode());
-        result = prime * result + ((testPolicyContextItem001 == null) ? 0 : testPolicyContextItem001.hashCode());
-        result = prime * result + ((testPolicyContextItem002 == null) ? 0 : testPolicyContextItem002.hashCode());
-        result = prime * result + ((testPolicyContextItem003 == null) ? 0 : testPolicyContextItem003.hashCode());
-        result = prime * result + ((testPolicyContextItem004 == null) ? 0 : testPolicyContextItem004.hashCode());
-        result = prime * result + ((testPolicyContextItem005 == null) ? 0 : testPolicyContextItem005.hashCode());
-        return result;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TestPolicyContextItem other = (TestPolicyContextItem) obj;
-        if (testPolicyContextItem000 == null) {
-            if (other.testPolicyContextItem000 != null) {
-                return false;
-            }
-        } else if (!testPolicyContextItem000.equals(other.testPolicyContextItem000)) {
-            return false;
-        }
-        if (testPolicyContextItem001 == null) {
-            if (other.testPolicyContextItem001 != null) {
-                return false;
-            }
-        } else if (!testPolicyContextItem001.equals(other.testPolicyContextItem001)) {
-            return false;
-        }
-        if (testPolicyContextItem002 == null) {
-            if (other.testPolicyContextItem002 != null) {
-                return false;
-            }
-        } else if (!testPolicyContextItem002.equals(other.testPolicyContextItem002)) {
-            return false;
-        }
-        if (testPolicyContextItem003 == null) {
-            if (other.testPolicyContextItem003 != null) {
-                return false;
-            }
-        } else if (!testPolicyContextItem003.equals(other.testPolicyContextItem003)) {
-            return false;
-        }
-        if (testPolicyContextItem004 == null) {
-            if (other.testPolicyContextItem004 != null) {
-                return false;
-            }
-        } else if (!testPolicyContextItem004.equals(other.testPolicyContextItem004)) {
-            return false;
-        }
-        if (testPolicyContextItem005 == null) {
-            if (other.testPolicyContextItem005 != null) {
-                return false;
-            }
-        } else if (!testPolicyContextItem005.equals(other.testPolicyContextItem005)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "TestPolicyContextItem [testPolicyContextItem000=" + testPolicyContextItem000
-                + ", testPolicyContextItem001=" + testPolicyContextItem001 + ", testPolicyContextItem002="
-                + testPolicyContextItem002 + ", testPolicyContextItem003=" + testPolicyContextItem003
-                + ", testPolicyContextItem004=" + testPolicyContextItem004 + ", testPolicyContextItem005="
-                + testPolicyContextItem005 + "]";
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/package-info.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/package-info.java
deleted file mode 100644
index d57b3fda3..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/concepts/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Defines test Java context classes.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.context.test.concepts;
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java
deleted file mode 100644
index ae0fea7ea..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-import java.io.IOException;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.model.utilities.comparison.KeyedMapComparer;
-import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class ContextAlbumUpdate is used to test Context Album updates.
- */
-public class ContextAlbumUpdate {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextAlbumUpdate.class);
-
-    /**
-     * Test context album update.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException the IO exception
-     * @throws ApexException the apex exception
-     */
-    public void testContextAlbumUpdate() throws ApexModelException, IOException, ApexException {
-        LOGGER.debug("Running TestContextAlbumUpdate test . . .");
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
-        final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        final AxContextModel longModel = TestContextAlbumFactory.createLongContextModel();
-        contextDistributor.registerModel(longModel);
-
-        final AxContextAlbum longAlbum1Def = longModel.getAlbums().get(new AxArtifactKey("LongContextAlbum1", "0.0.1"));
-        final ContextAlbum longAlbum1 = contextDistributor.createContextAlbum(longAlbum1Def.getKey());
-        assert (longAlbum1 != null);
-
-        final AxContextAlbum longAlbum2Def = longModel.getAlbums().get(new AxArtifactKey("LongContextAlbum2", "0.0.1"));
-        final ContextAlbum longAlbum2 = contextDistributor.createContextAlbum(longAlbum2Def.getKey());
-        assert (longAlbum2 != null);
-
-        // CHECKSTYLE:OFF: checkstyle:magicNumber
-        longAlbum1.put("0", (long) 0);
-        longAlbum1.put("1", (long) 1);
-        longAlbum1.put("2", (long) 2);
-        longAlbum1.put("3", (long) 3);
-
-        final KeyedMapDifference<String, Object> result0 =
-                new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
-        assert (0 == result0.getDifferentValues().size());
-        assert (0 == result0.getIdenticalValues().size());
-        assert (0 == result0.getRightOnly().size());
-        assert (4 == result0.getLeftOnly().size());
-
-        longAlbum2.putAll(longAlbum1);
-
-        final KeyedMapDifference<String, Object> result1 =
-                new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
-        assert (0 == result1.getDifferentValues().size());
-        assert (4 == result1.getIdenticalValues().size());
-        assert (0 == result1.getRightOnly().size());
-        assert (0 == result1.getLeftOnly().size());
-
-        longAlbum1.put("4", (long) 4);
-        longAlbum2.put("5", (long) 5);
-        longAlbum1.put("67", (long) 6);
-        longAlbum2.put("67", (long) 7);
-
-        final KeyedMapDifference<String, Object> result2 =
-                new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
-        assert (1 == result2.getDifferentValues().size());
-        assert (4 == result2.getIdenticalValues().size());
-        assert (1 == result2.getRightOnly().size());
-        assert (1 == result2.getLeftOnly().size());
-
-        longAlbum1.remove("0");
-        longAlbum2.remove("3");
-        // CHECKSTYLE:ON: checkstyle:magicNumber
-
-        final KeyedMapDifference<String, Object> result3 =
-                new KeyedMapComparer<String, Object>().compareMaps(longAlbum1, longAlbum2);
-
-        assert (1 == result3.getDifferentValues().size());
-        assert (2 == result3.getIdenticalValues().size());
-        assert (2 == result3.getRightOnly().size());
-        assert (2 == result3.getLeftOnly().size());
-
-        contextDistributor.clear();
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java
deleted file mode 100644
index 4b47c63db..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextInstantiation.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.TreeSet;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.ContextRuntimeException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextItem000;
-import org.onap.policy.apex.context.test.concepts.TestContextItem001;
-import org.onap.policy.apex.context.test.concepts.TestContextItem002;
-import org.onap.policy.apex.context.test.concepts.TestContextItem003;
-import org.onap.policy.apex.context.test.concepts.TestContextItem004;
-import org.onap.policy.apex.context.test.concepts.TestContextItem005;
-import org.onap.policy.apex.context.test.concepts.TestContextItem006;
-import org.onap.policy.apex.context.test.concepts.TestContextItem007;
-import org.onap.policy.apex.context.test.concepts.TestContextItem008;
-import org.onap.policy.apex.context.test.concepts.TestContextItem009;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00A;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00B;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00C;
-import org.onap.policy.apex.context.test.concepts.TestExternalContextItem;
-import org.onap.policy.apex.context.test.concepts.TestGlobalContextItem;
-import org.onap.policy.apex.context.test.concepts.TestPolicyContextItem;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextInstantiation is used to test Apex context insitiation is correct.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class ContextInstantiation {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextInstantiation.class);
-
-    /**
-     * Test context instantiation.
-     *
-     * @throws ContextException the context exception
-     */
-    // CHECKSTYLE:OFF: checkstyle:MaximumMethodLength
-    public void testContextInstantiation() throws ContextException {
-        // CHECKSTYLE:ON: checkstyle:MaximumMethodLength
-        LOGGER.debug("Running TestContextInstantiation test . . .");
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributorInit", "0.0.1");
-        Distributor contextDistributor = null;
-        try {
-            contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-        } catch (final Exception exception) {
-            LOGGER.error("Error occured while Instantiating Distributor for : {}", distributorKey, exception);
-            return;
-        }
-
-        // @formatter:off
-        final AxArtifactKey[] usedArtifactStackArray = {
-                new AxArtifactKey("testC-top", "0.0.1"), new AxArtifactKey("testC-next", "0.0.1"),
-                new AxArtifactKey("testC-bot", "0.0.1")
-        };
-        // @formatter:on
-
-        try {
-            // CHECKSTYLE:OFF: checkstyle:magicNumber
-            final AxContextModel policyContextModel = TestContextAlbumFactory.createPolicyContextModel();
-            final AxValidationResult result = new AxValidationResult();
-            policyContextModel.validate(result);
-            LOGGER.debug(result.toString());
-            assert (result.isValid());
-
-            contextDistributor.registerModel(policyContextModel);
-
-            final ContextAlbum policyContextAlbum =
-                    contextDistributor.createContextAlbum(new AxArtifactKey("PolicyContextAlbum", "0.0.1"));
-            assert (policyContextAlbum != null);
-            policyContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-            final Float testFloat = new Float(3.14159265359);
-            final Date testDate = new Date();
-
-            final TestContextItem009 tci9 = new TestContextItem009();
-            tci9.setDateValue(new TestContextItem008(testDate));
-            tci9.setTZValue(TimeZone.getTimeZone("Europe/Dublin").getDisplayName());
-            tci9.setDST(true);
-
-            final TestContextItem00A tciA = new TestContextItem00A();
-            tciA.setDateValue(new TestContextItem008(testDate));
-            tciA.setTZValue(TimeZone.getTimeZone("Europe/Dublin").getDisplayName());
-            tciA.setDST(true);
-            tciA.setUTCOffset(-600);
-            tciA.setLocale(Locale.ENGLISH);
-
-            final TreeSet<String> testTreeSet = new TreeSet<>();
-            testTreeSet.add("one hundred");
-            testTreeSet.add("one hundred and one");
-            testTreeSet.add("one hundred and two");
-            testTreeSet.add("one hundred and three");
-            testTreeSet.add("one hundred and four");
-
-            final Map<String, String> testHashMap = new HashMap<>();
-            testHashMap.put("0", "zero");
-            testHashMap.put("1", "one");
-            testHashMap.put("2", "two");
-            testHashMap.put("3", "three");
-            testHashMap.put("4", "four");
-
-            final TestContextItem006 testPolicyContextItem000 =
-                    new TestContextItem006("This is a policy context string");
-            final TestContextItem003 testPolicyContextItem001 = new TestContextItem003(0xFFFFFFFFFFFFFFFFL);
-            final TestContextItem005 testPolicyContextItem002 = new TestContextItem005(Math.PI);
-            final TestContextItem000 testPolicyContextItem003 = new TestContextItem000(true);
-            final TestContextItem003 testPolicyContextItem004 = new TestContextItem003(testDate.getTime());
-            final TestContextItem00C testPolicyContextItem005 = new TestContextItem00C(testHashMap);
-
-            final Map<String, Object> valueMapA = new LinkedHashMap<>();
-            valueMapA.put("TestPolicyContextItem001", testPolicyContextItem001);
-            valueMapA.put("TestPolicyContextItem002", testPolicyContextItem002);
-            valueMapA.put("TestPolicyContextItem003", testPolicyContextItem003);
-            valueMapA.put("TestPolicyContextItem004", testPolicyContextItem004);
-            valueMapA.put("TestPolicyContextItem005", testPolicyContextItem005);
-            valueMapA.put("TestPolicyContextItem000", testPolicyContextItem000);
-
-            try {
-                policyContextAlbum.put("TestPolicyContextItem000", testPolicyContextItem000);
-                assert ("Test should throw an exception".equals(""));
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage()
-                        .equals("Failed to set context value for key \"TestPolicyContextItem000\" in album \"PolicyContextAlbum:0.0.1\": "
-                                + "PolicyContextAlbum:0.0.1: object \"TestContextItem006 [stringValue=This is a policy context string]\" "
-                                + "of class \"org.onap.policy.apex.context.test.concepts.TestContextItem006\""
-                                + " not compatible with class \"org.onap.policy.apex.context.test.concepts.TestPolicyContextItem\""));
-            }
-
-            try {
-                policyContextAlbum.putAll(valueMapA);
-                assert ("Test should throw an exception".equals(""));
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage()
-                        .equals("Failed to set context value for key \"TestPolicyContextItem001\" in album \"PolicyContextAlbum:0.0.1\": "
-                                + "PolicyContextAlbum:0.0.1: object \"TestContextItem003 [longValue=-1]\" "
-                                + "of class \"org.onap.policy.apex.context.test.concepts.TestContextItem003\""
-                                + " not compatible with class \"org.onap.policy.apex.context.test.concepts.TestPolicyContextItem\""));
-            }
-
-            final TestPolicyContextItem policyContext = new TestPolicyContextItem();
-
-            LOGGER.debug(policyContextAlbum.toString());
-
-            policyContext.setTestPolicyContextItem000(testPolicyContextItem000);
-            policyContext.setTestPolicyContextItem001(testPolicyContextItem001);
-            policyContext.setTestPolicyContextItem002(testPolicyContextItem002);
-            policyContext.setTestPolicyContextItem003(testPolicyContextItem003);
-            policyContext.setTestPolicyContextItem004(testPolicyContextItem004);
-            policyContext.setTestPolicyContextItem005(testPolicyContextItem005);
-
-            final Map<String, Object> valueMap0 = new HashMap<>();
-            valueMap0.put("TestPolicyContextItem", policyContext);
-
-            policyContextAlbum.putAll(valueMap0);
-
-            final TestPolicyContextItem contextItem =
-                    (TestPolicyContextItem) policyContextAlbum.get("TestPolicyContextItem");
-            assert (contextItem.getTestPolicyContextItem000().getStringValue()
-                    .equals("This is a policy context string"));
-            assert (contextItem.getTestPolicyContextItem001().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
-            assert (Double.compare(contextItem.getTestPolicyContextItem002().getDoubleValue(), Math.PI) == 0);
-            assert (contextItem.getTestPolicyContextItem003().getFlag());
-            assert (contextItem.getTestPolicyContextItem004().getLongValue() == testDate.getTime());
-            assert (contextItem.getTestPolicyContextItem005().getMapValue().equals(testHashMap));
-
-            final AxContextModel globalContextModel = TestContextAlbumFactory.createGlobalContextModel();
-
-            final TestContextItem000 testGlobalContextItem000 = new TestContextItem000(false);
-            final TestContextItem001 testGlobalContextItem001 = new TestContextItem001((byte) 0xFF);
-            final TestContextItem002 testGlobalContextItem002 = new TestContextItem002(0xFFFFFFFF);
-            final TestContextItem003 testGlobalContextItem003 = new TestContextItem003(0xFFFFFFFFFFFFFFFFL);
-            final TestContextItem004 testGlobalContextItem004 = new TestContextItem004(testFloat);
-            final TestContextItem005 testGlobalContextItem005 = new TestContextItem005(Math.PI);
-            final TestContextItem006 testGlobalContextItem006 =
-                    new TestContextItem006("This is a global context string");
-            final TestContextItem007 testGlobalContextItem007 = new TestContextItem007(testDate.getTime());
-            final TestContextItem008 testGlobalContextItem008 = new TestContextItem008(testDate);
-            final TestContextItem00B testGlobalContextItem00B = new TestContextItem00B(testTreeSet);
-            final TestContextItem00C testGlobalContextItem00C = new TestContextItem00C(testHashMap);
-
-            final TestGlobalContextItem globalContext = new TestGlobalContextItem();
-
-            globalContext.setTestGlobalContextItem000(testGlobalContextItem000);
-            globalContext.setTestGlobalContextItem001(testGlobalContextItem001);
-            globalContext.setTestGlobalContextItem002(testGlobalContextItem002);
-            globalContext.setTestGlobalContextItem003(testGlobalContextItem003);
-            globalContext.setTestGlobalContextItem004(testGlobalContextItem004);
-            globalContext.setTestGlobalContextItem005(testGlobalContextItem005);
-            globalContext.setTestGlobalContextItem006(testGlobalContextItem006);
-            globalContext.setTestGlobalContextItem007(testGlobalContextItem007);
-            globalContext.setTestGlobalContextItem008(testGlobalContextItem008);
-            globalContext.setTestGlobalContextItem009(tci9);
-            globalContext.setTestGlobalContextItem00A(tciA);
-            globalContext.setTestGlobalContextItem00B(testGlobalContextItem00B);
-            globalContext.setTestGlobalContextItem00C(testGlobalContextItem00C);
-            final Map<String, Object> valueMap1 = new HashMap<>();
-            valueMap1.put("globalContext", globalContext);
-
-            try {
-                contextDistributor.registerModel(globalContextModel);
-            } catch (final ContextException e) {
-                assert (e.getMessage().equals(
-                        "active context albums found in distributor, clear the distributor before registering models"));
-            }
-
-            contextDistributor.registerModel(globalContextModel);
-
-            final ContextAlbum globalContextAlbum =
-                    contextDistributor.createContextAlbum(new AxArtifactKey("GlobalContextAlbum", "0.0.1"));
-            assert (globalContextAlbum != null);
-            globalContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-            globalContextAlbum.putAll(valueMap1);
-
-            final TestGlobalContextItem globalContextItem =
-                    (TestGlobalContextItem) globalContextAlbum.get("globalContext");
-            assert (!globalContextItem.getTestGlobalContextItem000().getFlag());
-            assert (globalContextItem.getTestGlobalContextItem001().getByteValue() == (byte) 0xFF);
-            assert (globalContextItem.getTestGlobalContextItem002().getIntValue() == 0xFFFFFFFF);
-            assert (globalContextItem.getTestGlobalContextItem003().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
-            assert (Float.compare(globalContextItem.getTestGlobalContextItem004().getFloatValue(), testFloat) == 0);
-            assert (Double.compare(globalContextItem.getTestGlobalContextItem005().getDoubleValue(), Math.PI) == 0);
-            assert (globalContextItem.getTestGlobalContextItem006().getStringValue()
-                    .equals("This is a global context string"));
-            assert (globalContextItem.getTestGlobalContextItem007().getLongValue() == testDate.getTime());
-            assert (globalContextItem.getTestGlobalContextItem008().getDateValue().equals(testDate));
-            assert (globalContextItem.getTestGlobalContextItem009().getDateValue().getTime() == tci9.getDateValue()
-                    .getTime());
-            assert (globalContextItem.getTestGlobalContextItem00A().getDateValue().getTime() == tciA.getDateValue()
-                    .getTime());
-            assert (globalContextItem.getTestGlobalContextItem00B().getSetValue().equals(testTreeSet));
-            assert (globalContextItem.getTestGlobalContextItem00C().getMapValue().equals(testHashMap));
-
-            final AxContextModel externalContextModel = TestContextAlbumFactory.createExternalContextModel();
-
-            final TestExternalContextItem externalContext = new TestExternalContextItem();
-
-            final TestContextItem000 testExternalContextItem000 = new TestContextItem000(false);
-            final TestContextItem001 testExternalContextItem001 = new TestContextItem001((byte) 0xFF);
-            final TestContextItem002 testExternalContextItem002 = new TestContextItem002(0xFFFFFFFF);
-            final TestContextItem003 testExternalContextItem003 = new TestContextItem003(0xFFFFFFFFFFFFFFFFL);
-            final TestContextItem004 testExternalContextItem004 = new TestContextItem004(testFloat);
-            final TestContextItem005 testExternalContextItem005 = new TestContextItem005(Math.PI);
-            final TestContextItem006 testExternalContextItem006 =
-                    new TestContextItem006("This is an external context string");
-            final TestContextItem007 testExternalContextItem007 = new TestContextItem007(testDate.getTime());
-            final TestContextItem008 testExternalContextItem008 = new TestContextItem008(testDate);
-            final TestContextItem00B testExternalContextItem00B = new TestContextItem00B(testTreeSet);
-            final TestContextItem00C testExternalContextItem00C = new TestContextItem00C(testHashMap);
-
-            final TestContextItem009 tci9A = new TestContextItem009(tci9);
-            final TestContextItem00A tciAA = new TestContextItem00A(tciA);
-
-            externalContext.setTestExternalContextItem000(testExternalContextItem000);
-            externalContext.setTestExternalContextItem001(testExternalContextItem001);
-            externalContext.setTestExternalContextItem002(testExternalContextItem002);
-            externalContext.setTestExternalContextItem003(testExternalContextItem003);
-            externalContext.setTestExternalContextItem004(testExternalContextItem004);
-            externalContext.setTestExternalContextItem005(testExternalContextItem005);
-            externalContext.setTestExternalContextItem006(testExternalContextItem006);
-            externalContext.setTestExternalContextItem007(testExternalContextItem007);
-            externalContext.setTestExternalContextItem008(testExternalContextItem008);
-            externalContext.setTestExternalContextItem009(tci9A);
-            externalContext.setTestExternalContextItem00A(tciAA);
-            externalContext.setTestExternalContextItem00B(testExternalContextItem00B);
-            externalContext.setTestExternalContextItem00C(testExternalContextItem00C);
-
-            final Map<String, Object> valueMap2 = new HashMap<>();
-            valueMap2.put("externalContext", externalContext);
-
-            contextDistributor.clear();
-            contextDistributor.init(new AxArtifactKey("ClearedandInittedDistributor", "0.0.1"));
-            contextDistributor.registerModel(externalContextModel);
-
-            final ContextAlbum externalContextAlbum =
-                    contextDistributor.createContextAlbum(new AxArtifactKey("ExternalContextAlbum", "0.0.1"));
-            assert (externalContextAlbum != null);
-            externalContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-            externalContextAlbum.putAll(valueMap2);
-            externalContextAlbum.getAlbumDefinition().setWritable(false);
-
-            final TestExternalContextItem externalContextItem =
-                    (TestExternalContextItem) externalContextAlbum.get("externalContext");
-
-            assert (!externalContextItem.getTestExternalContextItem000().getFlag());
-            assert (externalContextItem.getTestExternalContextItem001().getByteValue() == (byte) 0xFF);
-            assert (externalContextItem.getTestExternalContextItem002().getIntValue() == 0xFFFFFFFF);
-            assert (externalContextItem.getTestExternalContextItem003().getLongValue() == 0xFFFFFFFFFFFFFFFFL);
-            assert (Float.compare(externalContextItem.getTestExternalContextItem004().getFloatValue(), testFloat) == 0);
-            assert (Double.compare(externalContextItem.getTestExternalContextItem005().getDoubleValue(), Math.PI) == 0);
-            assert (externalContextItem.getTestExternalContextItem006().getStringValue()
-                    .equals("This is an external context string"));
-            assert (externalContextItem.getTestExternalContextItem007().getLongValue() == testDate.getTime());
-            assert (externalContextItem.getTestExternalContextItem008().getDateValue().equals(testDate));
-            assert (externalContextItem.getTestExternalContextItem009().getDateValue().getTime() == tci9A.getDateValue()
-                    .getTime());
-            assert (externalContextItem.getTestExternalContextItem00A().getDateValue().getTime() == tciAA.getDateValue()
-                    .getTime());
-            assert (externalContextItem.getTestExternalContextItem00B().getSetValue().equals(testTreeSet));
-            assert (externalContextItem.getTestExternalContextItem00C().getMapValue().equals(testHashMap));
-
-            final Collection<Object> mapValues = externalContextAlbum.values();
-            assert (externalContextAlbum.values().containsAll(mapValues));
-
-            // Check that clearing does not work
-            try {
-                externalContextAlbum.clear();
-                assert ("Test should throw an exception".equals(""));
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage()
-                        .equals("album \"ExternalContextAlbum:0.0.1\" clear() not allowed on read only albums"));
-            }
-
-            assert (externalContextAlbum.size() == 1);
-
-            try {
-                externalContextAlbum.containsKey(null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals("null values are illegal on method parameter \"key\""));
-            }
-
-            assert (externalContextAlbum.containsKey("externalContext"));
-            assert (!externalContextAlbum.containsKey("globalContext"));
-
-            try {
-                externalContextAlbum.containsValue(null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals("null values are illegal on method parameter \"value\""));
-            }
-
-            assert (externalContextAlbum.containsValue(externalContext));
-            assert (!externalContextAlbum.containsValue(new String("Hello")));
-
-            final Set<Entry<String, Object>> entrySet = externalContextAlbum.entrySet();
-            assert (entrySet.size() == 1);
-
-            try {
-                externalContextAlbum.get(null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage()
-                        .equals("album \"ExternalContextAlbum:0.0.1\" null keys are illegal on keys for get()"));
-            }
-
-            final Object aObject = externalContextAlbum.get("externalContext");
-            assert (aObject.equals(externalContext));
-
-            // put null keys should fail, throws a runtime exception
-            try {
-                externalContextAlbum.put(null, null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage()
-                        .equals("album \"ExternalContextAlbum:0.0.1\" null keys are illegal on keys for put()"));
-            }
-
-            try {
-                externalContextAlbum.put("TestExternalContextItem00A", null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals(
-                        "album \"ExternalContextAlbum:0.0.1\" null values are illegal on key \"TestExternalContextItem00A\" for put()"));
-            }
-            assert (externalContextItem.getTestExternalContextItem00A().equals(tciAA));
-
-            // Should return the hash set
-            assert (externalContextItem.getTestExternalContextItem00B().getSetValue().equals(testTreeSet));
-
-            assert (externalContextAlbum.values().containsAll(mapValues));
-
-            // Set the write flag back as it should be
-            externalContextAlbum.getAlbumDefinition().setWritable(true);
-
-            // Put should return the previous contextItem
-            final TestExternalContextItem externalContextOther = new TestExternalContextItem();
-            externalContextOther.setTestExternalContextItem002(new TestContextItem002());
-            externalContextOther.getTestExternalContextItem002().setIntValue(2000);
-
-            final Object object = externalContextAlbum.put("externalContext", externalContextOther);
-            assert (object.equals(externalContext));
-
-            final TestExternalContextItem item = (TestExternalContextItem) externalContextAlbum.get("externalContext");
-            assert (item.getTestExternalContextItem002().getIntValue() == 2000);
-            final Object actualExternalContext = externalContextAlbum.put("externalContext", externalContext);
-            assert (actualExternalContext.equals(externalContextOther));
-            assert (externalContextItem.getTestExternalContextItem002().getIntValue() == -1);
-
-            try {
-                externalContextAlbum.put("TestExternalContextItem00A", null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals(
-                        "album \"ExternalContextAlbum:0.0.1\" null values are illegal on key \"TestExternalContextItem00A\" for put()"));
-            }
-            assert (externalContextAlbum.get("externalContext").equals(externalContext));
-
-            try {
-                externalContextAlbum.put("TestExternalContextItemFFF", null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals(
-                        "album \"ExternalContextAlbum:0.0.1\" null values are illegal on key \"TestExternalContextItemFFF\" for put()"));
-            }
-            assert (externalContextAlbum.size() == 1);
-
-            try {
-                externalContextAlbum.put("TestExternalContextItemFFF", null);
-            } catch (final ContextRuntimeException e) {
-                assert (e.getMessage().equals(
-                        "album \"ExternalContextAlbum:0.0.1\" null values are illegal on key \"TestExternalContextItemFFF\" for put()"));
-            }
-            assert (externalContextAlbum.size() == 1);
-
-            // Should ignore remove
-            externalContextAlbum.remove("TestExternalContextItem017");
-            assert (externalContextAlbum.size() == 1);
-
-            assert (externalContextAlbum.values().size() == 1);
-            assert (externalContextAlbum.values().containsAll(mapValues));
-            // CHECKSTYLE:ON: checkstyle:magicNumber
-        } catch (final Exception exception) {
-            LOGGER.error("Error: ", exception);
-            contextDistributor.clear();
-            assert ("Test has failed".equals(""));
-        }
-
-        try {
-            contextDistributor.clear();
-        } catch (final Exception exception) {
-            LOGGER.error("Error occured while clearing context distributor: ", exception);
-            assert ("Test has failed".equals(""));
-        }
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java
deleted file mode 100644
index d104900c9..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextRuntimeException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextItem008;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00A;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00C;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextUpdate checks context updates.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class ContextUpdate {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextUpdate.class);
-
-    /**
-     * Test context update.
-     *
-     * @throws ApexModelException the apex model exception
-     * @throws IOException the IO exception
-     * @throws ApexException the apex exception
-     */
-    public void testContextUpdate() throws ApexModelException, IOException, ApexException {
-        LOGGER.debug("Running TestContextUpdate test . . .");
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
-        final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        // @formatter:off
-        final AxArtifactKey[] usedArtifactStackArray = {
-                new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"),
-                new AxArtifactKey("testC-bot", "0.0.1")
-        };
-        // @formatter:on
-
-        // CHECKSTYLE:OFF: checkstyle:magicNumber
-
-        final AxContextModel multiModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-        contextDistributor.registerModel(multiModel);
-
-        final ContextAlbum longContextAlbum =
-                contextDistributor.createContextAlbum(new AxArtifactKey("LongContextAlbum", "0.0.1"));
-        assert (longContextAlbum != null);
-        longContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        final ContextAlbum dateContextAlbum =
-                contextDistributor.createContextAlbum(new AxArtifactKey("DateContextAlbum", "0.0.1"));
-        assert (dateContextAlbum != null);
-        longContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        final ContextAlbum mapContextAlbum =
-                contextDistributor.createContextAlbum(new AxArtifactKey("MapContextAlbum", "0.0.1"));
-        assert (mapContextAlbum != null);
-        mapContextAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        final TestContextItem00A tciA = new TestContextItem00A();
-        tciA.setDateValue(new TestContextItem008(new Date()));
-        tciA.setTZValue(TimeZone.getTimeZone("Europe/Dublin").getDisplayName());
-        tciA.setDST(true);
-        tciA.setUTCOffset(-600);
-        tciA.setLocale(Locale.ENGLISH);
-
-        final Map<String, String> testHashMap = new HashMap<>();
-        testHashMap.put("0", "zero");
-        testHashMap.put("1", "one");
-        testHashMap.put("2", "two");
-        testHashMap.put("3", "three");
-        testHashMap.put("4", "four");
-
-        final TestContextItem00C tciC = new TestContextItem00C(testHashMap);
-
-        longContextAlbum.put("0", (long) 0);
-        longContextAlbum.put("0", 0);
-        longContextAlbum.put("0", "0");
-
-        try {
-            longContextAlbum.put("0", "zero");
-            assert ("Test should throw an exception".equals(""));
-        } catch (final ContextRuntimeException e) {
-            assert (e.getMessage().equals(
-                    "Failed to set context value for key \"0\" in album \"LongContextAlbum:0.0.1\": LongContextAlbum:0.0.1: object \"zero\" of class \"java.lang.String\" not compatible with class \"java.lang.Long\""));
-        }
-
-        try {
-            longContextAlbum.put("0", "");
-            assert ("Test should throw an exception".equals(""));
-        } catch (final ContextRuntimeException e) {
-            assert (e.getMessage().equals(
-                    "Failed to set context value for key \"0\" in album \"LongContextAlbum:0.0.1\": LongContextAlbum:0.0.1: object \"\" of class \"java.lang.String\" not compatible with class \"java.lang.Long\""));
-        }
-
-        try {
-            longContextAlbum.put("0", null);
-            assert ("Test should throw an exception".equals(""));
-        } catch (final ContextRuntimeException e) {
-            assert (e.getMessage()
-                    .equals("album \"LongContextAlbum:0.0.1\" null values are illegal on key \"0\" for put()"));
-        }
-
-        try {
-            longContextAlbum.put(null, null);
-            assert ("Test should throw an exception".equals(""));
-        } catch (final ContextRuntimeException e) {
-            assert (e.getMessage().equals("album \"LongContextAlbum:0.0.1\" null keys are illegal on keys for put()"));
-        }
-
-        Object object = dateContextAlbum.put("date0", tciA);
-        assert (object == null);
-        object = dateContextAlbum.put("date0", tciA);
-        assert (object.equals(tciA));
-
-        object = mapContextAlbum.put("map0", tciC);
-        assert (object == null);
-        object = mapContextAlbum.put("map0", tciC);
-        assert (object.equals(tciC));
-
-        contextDistributor.clear();
-        // CHECKSTYLE:ON: checkstyle:magicNumber
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java
deleted file mode 100644
index e22321cdf..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiation.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextItem000;
-import org.onap.policy.apex.context.test.concepts.TestContextItem001;
-import org.onap.policy.apex.context.test.concepts.TestContextItem002;
-import org.onap.policy.apex.context.test.concepts.TestContextItem003;
-import org.onap.policy.apex.context.test.concepts.TestContextItem004;
-import org.onap.policy.apex.context.test.concepts.TestContextItem005;
-import org.onap.policy.apex.context.test.concepts.TestContextItem006;
-import org.onap.policy.apex.context.test.concepts.TestContextItem007;
-import org.onap.policy.apex.context.test.concepts.TestContextItem008;
-import org.onap.policy.apex.context.test.concepts.TestContextItem009;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00A;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class SequentialContextInstantiation checks sequential initiation of context.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class SequentialContextInstantiation {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(SequentialContextInstantiation.class);
-
-    /**
-     * Test sequential context instantiation.
-     *
-     * @throws ContextException the context exception
-     */
-    // CHECKSTYLE:OFF: checkstyle:MaximumMethodLength
-    public void testSequentialContextInstantiation() throws ContextException {
-        // CHECKSTYLE:ON: MaximumMethodLength
-        LOGGER.debug("Running TestContextInstantiation test . . .");
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
-        Distributor contextDistributor = null;
-        try {
-            contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-        } catch (final Exception exception) {
-            LOGGER.error("Error occured while Instantiating Distributor for : {}", distributorKey, exception);
-            assert ("Test has failed".equals(""));
-            return;
-        }
-
-        // @formatter:off
-       final AxArtifactKey[] usedArtifactStackArray = {
-                new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"),
-                new AxArtifactKey("testC-bot", "0.0.1")
-                };
-       // @formatter:on
-
-        try {
-            // CHECKSTYLE:OFF: checkstyle:magicNumber
-            final AxContextModel multiModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-            contextDistributor.registerModel(multiModel);
-
-            final ContextAlbum dateAlbum =
-                    contextDistributor.createContextAlbum(new AxArtifactKey("DateContextAlbum", "0.0.1"));
-            assert (dateAlbum != null);
-            dateAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-            final Date testDate = new Date();
-
-            final TestContextItem00A tciA00 = new TestContextItem00A();
-            tciA00.setDateValue(new TestContextItem008(new Date()));
-            tciA00.setTZValue(TimeZone.getTimeZone("Europe/Dublin").getDisplayName());
-            tciA00.setDST(true);
-            tciA00.setUTCOffset(-600);
-            tciA00.setLocale(Locale.ENGLISH);
-
-            dateAlbum.put("dv0", tciA00);
-            assert (tciA00.equals(dateAlbum.get("dv0")));
-
-            dateAlbum.put("dv1", tciA00);
-            assert (tciA00.equals(dateAlbum.get("dv1")));
-
-            final TestContextItem009 tci9 = new TestContextItem009();
-            tci9.setDateValue(new TestContextItem008(testDate));
-            tci9.setTZValue(TimeZone.getTimeZone("Europe/Dublin").getDisplayName());
-            tci9.setDST(true);
-
-            try {
-                dateAlbum.put("tci9", tci9);
-            } catch (final Exception e) {
-                assert (e.getMessage().contains(
-                        "class \"org.onap.policy.apex.context.test.concepts.TestContextItem009\" not compatible with class \"org.onap.policy.apex.context.test.concepts.TestContextItem00A\""));
-            }
-
-            final TestContextItem00A tciA01 = new TestContextItem00A(tciA00);
-            final TestContextItem00A tciA02 = new TestContextItem00A(tciA00);
-            final TestContextItem00A tciA03 = new TestContextItem00A(tciA00);
-
-            final Map<String, Object> valueMap0 = new HashMap<>();
-            valueMap0.put("Item01", tciA01);
-            valueMap0.put("Item02", tciA02);
-            valueMap0.put("Item03", tciA03);
-
-            dateAlbum.putAll(valueMap0);
-            assert (dateAlbum.size() == 5);
-            assert (tciA01.equals(dateAlbum.get("Item01")));
-            assert (tciA02.equals(dateAlbum.get("Item02")));
-            assert (tciA03.equals(dateAlbum.get("Item03")));
-
-            final Float testFloat = new Float(3.14159265359);
-
-            final TestContextItem000 testBadItem000 = new TestContextItem000();
-            final TestContextItem001 testBadItem001 = new TestContextItem001();
-            final TestContextItem002 testBadItem002 = new TestContextItem002();
-            final TestContextItem003 testBadItem003 = new TestContextItem003();
-            final TestContextItem004 testBadItem004 = new TestContextItem004();
-            final TestContextItem005 testBadItem005 = new TestContextItem005();
-            final TestContextItem006 testBadItem006 = new TestContextItem006();
-            final TestContextItem007 testBadItem007 = new TestContextItem007();
-            final TestContextItem008 testBadItem008 = new TestContextItem008();
-
-            testBadItem000.setFlag(false);
-            testBadItem001.setByteValue((byte) 0xFF);
-            testBadItem002.setIntValue(0xFFFFFFFF);
-            testBadItem003.setLongValue(0xFFFFFFFFFFFFFFFFL);
-            testBadItem004.setFloatValue(testFloat);
-            testBadItem005.setDoubleValue(Math.PI);
-            testBadItem006.setStringValue("This is a global context string");
-            testBadItem007.setLongValue(testDate.getTime());
-            testBadItem008.setDateValue(testDate);
-
-            final Map<String, Object> valueMap1 = new HashMap<>();
-            valueMap1.put("TestBadItem000", testBadItem000);
-            valueMap1.put("TestBadItem001", testBadItem001);
-            valueMap1.put("TestBadItem002", testBadItem002);
-            valueMap1.put("TestBadItem003", testBadItem003);
-            valueMap1.put("TestBadItem004", testBadItem004);
-            valueMap1.put("TestBadItem005", testBadItem005);
-            valueMap1.put("TestBadItem006", testBadItem006);
-            valueMap1.put("TestBadItem007", testBadItem007);
-            valueMap1.put("TestBadItem008", testBadItem008);
-            valueMap1.put("TestBadItem009", tci9);
-            valueMap1.put("Item00_2", tciA00);
-
-            // Get another reference to the album
-            final ContextAlbum dateAlbum1 =
-                    contextDistributor.createContextAlbum(new AxArtifactKey("DateContextAlbum", "0.0.1"));
-            assert (dateAlbum1 != null);
-            dateAlbum1.setUserArtifactStack(usedArtifactStackArray);
-
-            try {
-                dateAlbum1.putAll(valueMap1);
-            } catch (final Exception e) {
-                assert (e.getMessage().endsWith(
-                        "not compatible with class \"org.onap.policy.apex.context.test.concepts.TestContextItem00A\""));
-            }
-            assert (dateAlbum1.size() == 5);
-
-            valueMap1.clear();
-            valueMap1.put("Item00_2", tciA00);
-            dateAlbum1.putAll(valueMap1);
-            assert (dateAlbum1.size() == 6);
-
-            assert (tciA00.equals(dateAlbum1.get("Item00_2")));
-            dateAlbum.remove("Item00_2");
-            assert (5 == dateAlbum1.size());
-
-            final ContextAlbum dateAlbumCopy =
-                    contextDistributor.createContextAlbum(new AxArtifactKey("DateContextAlbum", "0.0.1"));
-            assert (dateAlbumCopy != null);
-            dateAlbumCopy.setUserArtifactStack(usedArtifactStackArray);
-
-            final Map<String, Object> valueMap2 = new HashMap<>();
-            valueMap2.put("Item04", tciA01);
-            valueMap2.put("Item05", tciA02);
-            valueMap2.put("Item06", tciA03);
-
-            dateAlbumCopy.putAll(valueMap2);
-            assert (8 == dateAlbumCopy.size());
-            assert (tciA03.equals(dateAlbumCopy.get("Item06")));
-
-            final Collection<Object> mapValues = dateAlbum.values();
-            assert (dateAlbumCopy.values().containsAll(mapValues));
-
-            // Check that clearing works
-            dateAlbum1.clear();
-            assert (dateAlbum1.size() == 0);
-
-            dateAlbum.put("Item00", tciA00);
-            final Map<String, Object> valueMap3 = new HashMap<>();
-            valueMap3.put("Item01", tciA01);
-            valueMap3.put("Item02", tciA02);
-            valueMap3.put("Item03", tciA03);
-            dateAlbum.putAll(valueMap3);
-
-            final Map<String, Object> valueMap4 = new HashMap<>();
-            valueMap4.put("Item04", tciA01);
-            valueMap4.put("Item05", tciA02);
-            valueMap4.put("Item06", tciA03);
-
-            dateAlbumCopy.putAll(valueMap4);
-
-            try {
-                dateAlbum.containsKey(null);
-            } catch (final Exception e) {
-                assert (e.getMessage().equals("null values are illegal on method parameter \"key\""));
-            }
-
-            for (final Entry<String, Object> entry : dateAlbum.entrySet()) {
-                System.out.println(entry.getKey() + "->" + entry.getValue());
-            }
-            assert (dateAlbum.containsKey("Item05"));
-            assert (!dateAlbum.containsKey("Item07"));
-
-            try {
-                dateAlbum.containsValue(null);
-            } catch (final Exception e) {
-                assert (e.getMessage().equals("null values are illegal on method parameter \"value\""));
-            }
-
-            assert (dateAlbum.containsValue(tciA01));
-            assert (!dateAlbum.containsValue(new String("Hello")));
-
-            final Set<Entry<String, Object>> entrySet = dateAlbum.entrySet();
-            assert (entrySet.size() == 7);
-
-            try {
-                assert (dateAlbum.get(null) == null);
-            } catch (final Exception e) {
-                assert (e.getMessage()
-                        .equals("album \"DateContextAlbum:0.0.1\" null keys are illegal on keys for get()"));
-            }
-
-            final Object aObject = dateAlbum.get("Item03");
-            assert (aObject.equals(tciA03));
-
-            try {
-                final Object object = dateAlbum.put(null, null);
-                assert (object == null);
-            } catch (final Exception e) {
-                assert (e.getMessage()
-                        .equals("album \"DateContextAlbum:0.0.1\" null keys are illegal on keys for put()"));
-            }
-
-            // Put null ContextItem should work (return null)
-            try {
-                dateAlbum.put("ItemNull", null);
-            } catch (final Exception e) {
-                assert (e.getMessage().equals(
-                        "album \"DateContextAlbum:0.0.1\" null values are illegal on key \"ItemNull\" for put()"));
-            }
-
-            // Should return null
-            assert (dateAlbum.get("ItemNull") == null);
-
-            // Put should return the previous contextItem
-            tciA00.setDST(false);
-            final TestContextItem00A tciA03_clone = new TestContextItem00A(tciA03);
-            tciA03_clone.setDST(true);
-            TestContextItem00A retItem = (TestContextItem00A) dateAlbum.put("Item03", tciA03_clone);
-            assert (retItem.equals(tciA03));
-            retItem = (TestContextItem00A) dateAlbum.put("Item03", tciA03);
-            assert (retItem.equals(tciA03_clone));
-
-            try {
-                dateAlbum.put("ItemNull", null);
-                assert (dateAlbum.get("ItemNull") == null);
-            } catch (final Exception e) {
-                assert (e.getMessage().equals(
-                        "album \"DateContextAlbum:0.0.1\" null values are illegal on key \"ItemNull\" for put()"));
-            }
-
-            dateAlbum.put("TestAA", tciA00);
-            assert (dateAlbum.get("TestAA").equals(tciA00));
-
-            // Should print warning
-            try {
-                dateAlbum.put("TestAA", null);
-            } catch (final Exception e) {
-                assert (e.getMessage().equals(
-                        "album \"DateContextAlbum:0.0.1\" null values are illegal on key \"TestAA\" for put()"));
-            }
-            assert (dateAlbum.size() == 8);
-            try {
-                dateAlbum.put("TestAB", null);
-            } catch (final Exception e) {
-                assert (e.getMessage().equals(
-                        "album \"DateContextAlbum:0.0.1\" null values are illegal on key \"TestAB\" for put()"));
-            }
-            assert (dateAlbum.size() == 8);
-
-            // Should do removes
-            dateAlbum.remove("TestAA");
-            dateAlbum.remove("TestAB");
-            dateAlbum.remove("ItemNull");
-            assert (dateAlbum.size() == 7);
-            assert (dateAlbumCopy.values().containsAll(mapValues));
-            // CHECKSTYLE:ON: checkstyle:magicNumber
-        } catch (final Exception exception) {
-            LOGGER.error("Error: ", exception);
-            contextDistributor.clear();
-            assert ("Test has failed".equals(""));
-        }
-
-        try {
-            contextDistributor.clear();
-        } catch (final Exception exception) {
-            LOGGER.error("Error occured while clearing context distributor", exception);
-            assert ("Test has failed".equals(""));
-        }
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/package-info.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/package-info.java
deleted file mode 100644
index 148c8cac4..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/distribution/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Runs context distribution tests in APEX.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.context.test.distribution;
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/factory/TestContextAlbumFactory.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/factory/TestContextAlbumFactory.java
deleted file mode 100644
index 64de009d5..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/factory/TestContextAlbumFactory.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.factory;
-
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
-
-/**
- * The Class TestContextAlbumFactory creates test context albums.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public final class TestContextAlbumFactory {
-    /**
-     * Default constructor to prevent sub-classing.
-     */
-    private TestContextAlbumFactory() {}
-
-    /**
-     * Creates the policy context model.
-     *
-     * @return the ax context model
-     */
-    public static AxContextModel createPolicyContextModel() {
-        final AxContextSchema policySchema = new AxContextSchema(new AxArtifactKey("PolicySchema", "0.0.1"), "Java",
-                "org.onap.policy.apex.context.test.concepts.TestPolicyContextItem");
-        final AxContextAlbum albumDefinition = new AxContextAlbum(new AxArtifactKey("PolicyContextAlbum", "0.0.1"),
-                "APPLICATION", true, policySchema.getKey());
-
-        final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey("Schemas", "0.0.1"));
-        schemas.getSchemasMap().put(policySchema.getKey(), policySchema);
-        final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey("context", "0.0.1"));
-        albums.getAlbumsMap().put(albumDefinition.getKey(), albumDefinition);
-
-        final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey("KeyInfoMapKey", "0.0.1"));
-        final AxContextModel contextModel =
-                new AxContextModel(new AxArtifactKey("PolicyContextModel", "0.0.1"), schemas, albums, keyInformation);
-        contextModel.setKeyInformation(keyInformation);
-        keyInformation.generateKeyInfo(contextModel);
-
-        return contextModel;
-    }
-
-    /**
-     * Creates the global context model.
-     *
-     * @return the ax context model
-     */
-    public static AxContextModel createGlobalContextModel() {
-        final AxContextSchema globalSchema = new AxContextSchema(new AxArtifactKey("GlobalSchema", "0.0.1"), "Java",
-                "org.onap.policy.apex.context.test.concepts.TestGlobalContextItem");
-        final AxContextAlbum albumDefinition = new AxContextAlbum(new AxArtifactKey("GlobalContextAlbum", "0.0.1"),
-                "GLOBAL", true, globalSchema.getKey());
-
-        final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey("Schemas", "0.0.1"));
-        schemas.getSchemasMap().put(globalSchema.getKey(), globalSchema);
-        final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey("context", "0.0.1"));
-        albums.getAlbumsMap().put(albumDefinition.getKey(), albumDefinition);
-
-        final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey("KeyInfoMapKey", "0.0.1"));
-        final AxContextModel contextModel =
-                new AxContextModel(new AxArtifactKey("GlobalContextModel", "0.0.1"), schemas, albums, keyInformation);
-        contextModel.setKeyInformation(keyInformation);
-        keyInformation.generateKeyInfo(contextModel);
-
-        return contextModel;
-    }
-
-    /**
-     * Creates the external context model.
-     *
-     * @return the ax context model
-     */
-    public static AxContextModel createExternalContextModel() {
-        final AxContextSchema externalSchema = new AxContextSchema(new AxArtifactKey("ExternalSchema", "0.0.1"), "Java",
-                "org.onap.policy.apex.context.test.concepts.TestExternalContextItem");
-        final AxContextAlbum albumDefinition = new AxContextAlbum(new AxArtifactKey("ExternalContextAlbum", "0.0.1"),
-                "EXTERNAL", true, externalSchema.getKey());
-
-        final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey("Schemas", "0.0.1"));
-        schemas.getSchemasMap().put(externalSchema.getKey(), externalSchema);
-        final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey("context", "0.0.1"));
-        albums.getAlbumsMap().put(albumDefinition.getKey(), albumDefinition);
-
-        final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey("KeyInfoMapKey", "0.0.1"));
-        final AxContextModel contextModel =
-                new AxContextModel(new AxArtifactKey("ExternalContextModel", "0.0.1"), schemas, albums, keyInformation);
-        contextModel.setKeyInformation(keyInformation);
-        keyInformation.generateKeyInfo(contextModel);
-
-        return contextModel;
-    }
-
-    /**
-     * Creates the long context model.
-     *
-     * @return the ax context model
-     */
-    public static AxContextModel createLongContextModel() {
-        final AxContextSchema longSchema =
-                new AxContextSchema(new AxArtifactKey("LongSchema", "0.0.1"), "Java", "java.lang.Long");
-        final AxContextAlbum albumDefinition1 = new AxContextAlbum(new AxArtifactKey("LongContextAlbum1", "0.0.1"),
-                "APPLICATION", true, longSchema.getKey());
-        final AxContextAlbum albumDefinition2 = new AxContextAlbum(new AxArtifactKey("LongContextAlbum2", "0.0.1"),
-                "APPLICATION", true, longSchema.getKey());
-
-        final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey("Schemas", "0.0.1"));
-        schemas.getSchemasMap().put(longSchema.getKey(), longSchema);
-        final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey("context", "0.0.1"));
-        albums.getAlbumsMap().put(albumDefinition1.getKey(), albumDefinition1);
-        albums.getAlbumsMap().put(albumDefinition2.getKey(), albumDefinition2);
-
-        final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey("KeyInfoMapKey", "0.0.1"));
-        final AxContextModel contextModel =
-                new AxContextModel(new AxArtifactKey("LongContextModel", "0.0.1"), schemas, albums, keyInformation);
-        contextModel.setKeyInformation(keyInformation);
-        keyInformation.generateKeyInfo(contextModel);
-
-        return contextModel;
-    }
-
-    /**
-     * Creates the multi albums context model.
-     *
-     * @return the ax context model
-     */
-    public static AxContextModel createMultiAlbumsContextModel() {
-        final AxContextSchema longSchema =
-                new AxContextSchema(new AxArtifactKey("LongSchema", "0.0.1"), "Java", "java.lang.Long");
-        final AxContextSchema lTypeSchema = new AxContextSchema(new AxArtifactKey("LTypeSchema", "0.0.1"), "Java",
-                "org.onap.policy.apex.context.test.concepts.TestContextItem003");
-        final AxContextSchema dateSchema = new AxContextSchema(new AxArtifactKey("DateSchema", "0.0.1"), "Java",
-                "org.onap.policy.apex.context.test.concepts.TestContextItem00A");
-        final AxContextSchema mapSchema = new AxContextSchema(new AxArtifactKey("MapSchema", "0.0.1"), "Java",
-                "org.onap.policy.apex.context.test.concepts.TestContextItem00C");
-
-        final AxContextSchemas schemas = new AxContextSchemas(new AxArtifactKey("Schemas", "0.0.1"));
-        schemas.getSchemasMap().put(longSchema.getKey(), longSchema);
-        schemas.getSchemasMap().put(lTypeSchema.getKey(), lTypeSchema);
-        schemas.getSchemasMap().put(dateSchema.getKey(), dateSchema);
-        schemas.getSchemasMap().put(mapSchema.getKey(), mapSchema);
-
-        final AxContextAlbum longAlbumDefinition = new AxContextAlbum(new AxArtifactKey("LongContextAlbum", "0.0.1"),
-                "APPLICATION", true, longSchema.getKey());
-        final AxContextAlbum lTypeAlbumDefinition = new AxContextAlbum(new AxArtifactKey("LTypeContextAlbum", "0.0.1"),
-                "APPLICATION", true, lTypeSchema.getKey());
-        final AxContextAlbum dateAlbumDefinition = new AxContextAlbum(new AxArtifactKey("DateContextAlbum", "0.0.1"),
-                "APPLICATION", true, dateSchema.getKey());
-        final AxContextAlbum mapAlbumDefinition = new AxContextAlbum(new AxArtifactKey("MapContextAlbum", "0.0.1"),
-                "APPLICATION", true, mapSchema.getKey());
-
-        final AxContextAlbums albums = new AxContextAlbums(new AxArtifactKey("context", "0.0.1"));
-        albums.getAlbumsMap().put(longAlbumDefinition.getKey(), longAlbumDefinition);
-        albums.getAlbumsMap().put(lTypeAlbumDefinition.getKey(), lTypeAlbumDefinition);
-        albums.getAlbumsMap().put(dateAlbumDefinition.getKey(), dateAlbumDefinition);
-        albums.getAlbumsMap().put(mapAlbumDefinition.getKey(), mapAlbumDefinition);
-
-        final AxKeyInformation keyInformation = new AxKeyInformation(new AxArtifactKey("KeyInfoMapKey", "0.0.1"));
-        final AxContextModel contextModel = new AxContextModel(new AxArtifactKey("MultiAlbumsContextModel", "0.0.1"),
-                schemas, albums, keyInformation);
-        contextModel.setKeyInformation(keyInformation);
-        keyInformation.generateKeyInfo(contextModel);
-
-        return contextModel;
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/factory/package-info.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/factory/package-info.java
deleted file mode 100644
index ea70ce2a8..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/factory/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains factories for creating test context albums.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.context.test.factory;
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java
deleted file mode 100644
index 35db5ddf6..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.locking;
-
-import java.io.IOException;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.concepts.TestContextItem003;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContext tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContext {
-    private static final int TEN_MILLISECONDS = 10;
-
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContext.class);
-
-    // The context distributor and map used by each test
-    private Distributor contextDistributor = null;
-    private ContextAlbum lTypeAlbum = null;
-
-    /**
-     * Test concurrent context.
-     *
-     * @param testType the test type
-     * @param jvmCount the jvm count
-     * @param threadCount the thread count
-     * @param threadLoops the thread loops
-     * @return the long
-     * @throws ApexModelException the apex model exception
-     * @throws IOException the IO exception
-     * @throws ApexException the apex exception
-     */
-    public long testConcurrentContext(final String testType, final int jvmCount, final int threadCount,
-            final int threadLoops) throws ApexModelException, IOException, ApexException {
-        final ConcurrentContext concurrentContext = new ConcurrentContext();
-
-        try {
-            concurrentContext.setupAndVerifyContext();
-        } catch (final Exception exception) {
-            LOGGER.error("Error occured while setting up and verifying concurrent context", exception);
-            throw exception;
-        }
-
-        LOGGER.debug("starting JVMs and threads . . .");
-
-        final Thread[] threadArray = new Thread[threadCount];
-
-        // Check if we have a single JVM or multiple JVMs
-        int runningThreadCount = -1;
-        if (jvmCount == 1) {
-            // Run everything in this JVM
-            for (int t = 0; t < threadCount; t++) {
-                threadArray[t] = new Thread(new ConcurrentContextThread(0, t, threadLoops));
-                threadArray[t].setName(testType + ":TestConcurrentContextThread_0_" + t);
-                threadArray[t].start();
-            }
-
-            runningThreadCount = threadCount;
-        } else {
-            // Spawn JVMs to run the tests
-            for (int j = 0; j < jvmCount; j++) {
-                threadArray[j] = new Thread(new ConcurrentContextJVMThread(testType, j, threadCount, threadLoops));
-                threadArray[j].setName(testType + ":TestConcurrentContextJVMThread_" + j);
-                threadArray[j].start();
-            }
-            runningThreadCount = jvmCount;
-        }
-
-        boolean allFinished;
-        do {
-            allFinished = true;
-            for (int i = 0; i < runningThreadCount; i++) {
-                if (threadArray[i].isAlive()) {
-                    allFinished = false;
-                    try {
-                        Thread.sleep(TEN_MILLISECONDS);
-                    } catch (final Exception e) {
-                    }
-                    break;
-                }
-            }
-        } while (!allFinished);
-
-        return concurrentContext.verifyAndClearContext(jvmCount, threadCount, threadLoops);
-    }
-
-    /**
-     * Setup and verify context.
-     *
-     * @throws ContextException the context exception
-     */
-    private void setupAndVerifyContext() throws ContextException {
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor", "0.0.1");
-        contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        // @formatter:off
-        final AxArtifactKey[] usedArtifactStackArray = {
-                new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"),
-                new AxArtifactKey("testC-bot", "0.0.1")
-                };
-        // @formatter:on
-
-        final AxContextModel albumsModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-        contextDistributor.registerModel(albumsModel);
-
-        lTypeAlbum = contextDistributor.createContextAlbum(new AxArtifactKey("LTypeContextAlbum", "0.0.1"));
-        assert (lTypeAlbum != null);
-        lTypeAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        // CHECKSTYLE:OFF: checkstyle:magicNumber
-        lTypeAlbum.put("lTypeValue0", new TestContextItem003(0xFFFFFFFFFFFFFFFFL));
-        lTypeAlbum.put("lTypeValue1", new TestContextItem003(0xFFFFFFFFFFFFFFFEL));
-        lTypeAlbum.put("lTypeValue2", new TestContextItem003(0xFFFFFFFFFFFFFFFDL));
-        lTypeAlbum.put("lTypeValue3", new TestContextItem003(0xFFFFFFFFFFFFFFFCL));
-        lTypeAlbum.put("lTypeValue4", new TestContextItem003(0xFFFFFFFFFFFFFFFBL));
-        lTypeAlbum.put("lTypeValue5", new TestContextItem003(0xFFFFFFFFFFFFFFFAL));
-        lTypeAlbum.put("lTypeValue6", new TestContextItem003(0xFFFFFFFFFFFFFFF9L));
-        lTypeAlbum.put("lTypeValue7", new TestContextItem003(0xFFFFFFFFFFFFFFF8L));
-        lTypeAlbum.put("lTypeValue8", new TestContextItem003(0xFFFFFFFFFFFFFFF7L));
-        lTypeAlbum.put("lTypeValue9", new TestContextItem003(0xFFFFFFFFFFFFFFF6L));
-        lTypeAlbum.put("lTypeValueA", new TestContextItem003(0xFFFFFFFFFFFFFFF5L));
-        lTypeAlbum.put("lTypeValueB", new TestContextItem003(0xFFFFFFFFFFFFFFF4L));
-        lTypeAlbum.put("lTypeValueC", new TestContextItem003(0xFFFFFFFFFFFFFFF3L));
-        lTypeAlbum.put("lTypeValueD", new TestContextItem003(0xFFFFFFFFFFFFFFF2L));
-        lTypeAlbum.put("lTypeValueE", new TestContextItem003(0xFFFFFFFFFFFFFFF1L));
-        lTypeAlbum.put("lTypeValueF", new TestContextItem003(0xFFFFFFFFFFFFFFF0L));
-        LOGGER.debug(lTypeAlbum.toString());
-        assert (lTypeAlbum.size() >= 16);
-        // CHECKSTYLE:ON: checkstyle:magicNumber
-
-        // The initial value for concurrent testing
-        final TestContextItem003 item = new TestContextItem003(0L);
-        lTypeAlbum.put("testValue", item);
-
-    }
-
-    /**
-     * Verify and clear context.
-     *
-     * @param jvmCount the jvm count
-     * @param threadCount the thread count
-     * @param threadLoops the thread loops
-     * @return the long
-     * @throws ContextException the context exception
-     */
-    private long verifyAndClearContext(final int jvmCount, final int threadCount, final int threadLoops)
-            throws ContextException {
-        try {
-            LOGGER.debug("threads finished, end value is {}",
-                    ((TestContextItem003) lTypeAlbum.get("testValue")).getLongValue());
-        } catch (final Exception exception) {
-            LOGGER.error("Error: ", exception);
-        }
-        final long total = ((TestContextItem003) lTypeAlbum.get("testValue")).getLongValue();
-
-        contextDistributor.clear();
-        contextDistributor = null;
-
-        return total;
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVM.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVM.java
deleted file mode 100644
index 0145bd161..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVM.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.locking;
-
-import com.google.gson.Gson;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map.Entry;
-import java.util.TreeSet;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.service.AbstractParameters;
-import org.onap.policy.apex.model.basicmodel.service.ParameterService;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class ConcurrentContextJVM tests concurrent use of context in a single JVM.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public final class ConcurrentContextJVM {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextJVM.class);
-
-    private static final int TEN_MILLISECONDS = 10;
-    private static final int IPV4_ADDRESS_LENGTH = 4;
-
-    /**
-     * The Constructor.
-     *
-     * @param testType the test type
-     * @param jvmNo the jvm no
-     * @param threadCount the thread count
-     * @param threadLoops the thread loops
-     * @throws ApexException the apex exception
-     */
-    private ConcurrentContextJVM(final String testType, final int jvmNo, final int threadCount, final int threadLoops)
-            throws ApexException {
-        super();
-        LOGGER.debug("starting JVMs and threads . . .");
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor" + jvmNo, "0.0.1");
-        final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        // @formatter:off
-        final AxArtifactKey[] usedArtifactStackArray = {
-                new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"),
-                new AxArtifactKey("testC-bot", "0.0.1")
-                };
-        // @formatter:on
-
-        final AxContextModel albumsModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-        contextDistributor.registerModel(albumsModel);
-
-        final ContextAlbum lTypeAlbum =
-                contextDistributor.createContextAlbum(new AxArtifactKey("LTypeContextAlbum", "0.0.1"));
-        assert (lTypeAlbum != null);
-        lTypeAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        final Thread[] threadArray = new Thread[threadCount];
-
-        for (int t = 0; t < threadCount; t++) {
-            threadArray[t] = new Thread(new ConcurrentContextThread(jvmNo, t, threadLoops));
-            threadArray[t].setName(testType + ":ConcurrentContextThread_" + jvmNo + "_" + t);
-            threadArray[t].start();
-            LOGGER.debug("started thread " + threadArray[t].getName());
-        }
-
-        boolean allFinished;
-        do {
-            allFinished = true;
-            for (int t = 0; t < threadCount; t++) {
-                if (threadArray[t].isAlive()) {
-                    allFinished = false;
-                    try {
-                        Thread.sleep(TEN_MILLISECONDS);
-                    } catch (final Exception e) {
-                    }
-                    break;
-                }
-            }
-        } while (!allFinished);
-
-        LOGGER.debug("threads finished, end value is {}", lTypeAlbum.get("testValue"));
-        contextDistributor.clear();
-    }
-
-    /**
-     * The main method.
-     *
-     * @param args the args
-     * @throws Exception Any exception thrown by the test code
-     */
-    @SuppressWarnings("unchecked")
-    public static void main(final String[] args) throws Exception {
-        configure();
-
-        System.out.println("JVM Arguments: " + Arrays.toString(args));
-        // CHECKSTYLE:OFF: checkstyle:magicNumber
-
-        // An even number of arguments greater than 3
-        if (args.length < 4 || (args.length % 2 != 0)) {
-            LOGGER.error("invalid arguments: " + Arrays.toString(args));
-            LOGGER.error(
-                    "usage: TestConcurrentContextJVM testType jvmNo threadCount threadLoops [parameterKey parameterJson].... ");
-            return;
-        }
-
-        int jvmNo = -1;
-        int threadCount = -1;
-        int threadLoops = -1;
-
-        try {
-            jvmNo = Integer.parseInt(args[1]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument jvmNo", e);
-            return;
-        }
-
-        try {
-            threadCount = Integer.parseInt(args[2]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument threadCount", e);
-            return;
-        }
-
-        try {
-            threadLoops = Integer.parseInt(args[3]);
-        } catch (final Exception e) {
-            LOGGER.error("invalid argument threadLoops", e);
-            return;
-        }
-
-        for (int p = 4; p < args.length - 1; p += 2) {
-            @SuppressWarnings("rawtypes")
-            final Class parametersClass = Class.forName(args[p]);
-            final AbstractParameters parameters =
-                    (AbstractParameters) new Gson().fromJson(args[p + 1], parametersClass);
-            ParameterService.registerParameters(parametersClass, parameters);
-        }
-
-        for (final Entry<Class<?>, AbstractParameters> parameterEntry : ParameterService.getAll()) {
-            LOGGER.info("Parameter class " + parameterEntry.getKey().getCanonicalName() + "="
-                    + parameterEntry.getValue().toString());
-        }
-
-        try {
-            new ConcurrentContextJVM(args[0], jvmNo, threadCount, threadLoops);
-        } catch (final Exception e) {
-            LOGGER.error("error running test in JVM", e);
-            return;
-        }
-        // CHECKSTYLE:ON: checkstyle:magicNumber
-    }
-
-    /**
-     * This method setus up any static configuration required by the JVM.
-     *
-     * @throws Exception on configuration errors
-     */
-    public static void configure() throws Exception {
-        System.setProperty("java.net.preferIPv4Stack", "true");
-        System.setProperty("hazelcast.config", "src/test/resources/hazelcast/hazelcast.xml");
-
-        // The JGroups IP address must be set to a real (not loopback) IP address for Infinispan to work. IN order to
-        // ensure that all
-        // the JVMs in a test pick up the same IP address, this function sets te address to be the first non-loopback
-        // IPv4 address
-        // on a host
-        final TreeSet<String> ipAddressSet = new TreeSet<String>();
-
-        final Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
-        for (final NetworkInterface netint : Collections.list(nets)) {
-            final Enumeration<InetAddress> inetAddresses = netint.getInetAddresses();
-            for (final InetAddress inetAddress : Collections.list(inetAddresses)) {
-                // Look for real IPv4 Internet addresses
-                if (!inetAddress.isLoopbackAddress() && inetAddress.getAddress().length == IPV4_ADDRESS_LENGTH) {
-                    ipAddressSet.add(inetAddress.getHostAddress());
-                }
-            }
-        }
-
-        if (ipAddressSet.size() == 0) {
-            throw new Exception("cound not find real IP address for test");
-        }
-        System.out.println("Setting jgroups.tcp.address to: " + ipAddressSet.first());
-        System.setProperty("jgroups.tcp.address", ipAddressSet.first());
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java
deleted file mode 100644
index 020eed898..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextJVMThread.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.locking;
-
-import com.google.gson.Gson;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.service.AbstractParameters;
-import org.onap.policy.apex.model.basicmodel.service.ParameterService;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContextThread tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContextJVMThread implements Runnable {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextJVMThread.class);
-
-    private final String testType;
-    private final int jvm;
-    private final int threadCount;
-    private final int target;
-
-    /**
-     * The Constructor.
-     *
-     * @param testType the test type
-     * @param jvm the jvm
-     * @param threadCount the thread count
-     * @param target the target
-     * @throws ApexException the apex exception
-     */
-    public ConcurrentContextJVMThread(final String testType, final int jvm, final int threadCount, final int target)
-            throws ApexException {
-        this.testType = testType;
-        this.jvm = jvm;
-        this.threadCount = threadCount;
-        this.target = target;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Runnable#run()
-     */
-    @Override
-    public void run() {
-        final List<String> commandList = new ArrayList<>();
-        commandList.add(System.getProperty("java.home") + System.getProperty("file.separator") + "bin"
-                + System.getProperty("file.separator") + "java");
-        commandList.add("-cp");
-        commandList.add(System.getProperty("java.class.path"));
-        commandList.add("org.onap.policy.apex.context.test.locking.ConcurrentContextJVM");
-        commandList.add(testType);
-        commandList.add(new Integer(jvm).toString());
-        commandList.add(new Integer(threadCount).toString());
-        commandList.add(new Integer(target).toString());
-
-        for (final Entry<Class<?>, AbstractParameters> parameterServiceEntry : ParameterService.getAll()) {
-            commandList.add(parameterServiceEntry.getKey().getCanonicalName());
-            commandList.add(new Gson().toJson(parameterServiceEntry.getValue()));
-        }
-
-        LOGGER.info("starting JVM " + jvm);
-
-        // Run the JVM
-        final ProcessBuilder processBuilder = new ProcessBuilder(commandList);
-        processBuilder.redirectErrorStream(true);
-        Process process;
-
-        try {
-            process = processBuilder.start();
-
-            final InputStream is = process.getInputStream();
-            final InputStreamReader isr = new InputStreamReader(is);
-            final BufferedReader br = new BufferedReader(isr);
-            String line;
-            LOGGER.info("JVM Output for command " + commandList + "\n");
-            while ((line = br.readLine()) != null) {
-                LOGGER.info(line);
-            }
-
-            // Wait to get exit value
-            try {
-                final int exitValue = process.waitFor();
-                LOGGER.info("\n\nJVM " + jvm + " finished, exit value is " + exitValue);
-            } catch (final InterruptedException e) {
-                LOGGER.warn("Thread was interrupted");
-                Thread.currentThread().interrupt();
-            }
-        } catch (final IOException ioException) {
-            LOGGER.error("Error occured while writing JVM Output for command ", ioException);
-        }
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java
deleted file mode 100644
index 42e3e0978..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContextThread.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.locking;
-
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.ContextException;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.context.test.concepts.TestContextItem003;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContextThread tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ConcurrentContextThread implements Runnable {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ConcurrentContextThread.class);
-    private final Distributor distributor;
-    private final int jvm;
-    private final int instance;
-    private final int threadLoops;
-
-    /**
-     * The Constructor.
-     *
-     * @param jvm the jvm
-     * @param instance the instance
-     * @param threadLoops the thread loops
-     * @throws ApexException the apex exception
-     */
-    public ConcurrentContextThread(final int jvm, final int instance, final int threadLoops) throws ApexException {
-        this.jvm = jvm;
-        this.instance = instance;
-        this.threadLoops = threadLoops;
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("ApexDistributor_" + jvm + "_" + instance, "0.0.1");
-
-        new ContextParameters();
-        distributor = new DistributorFactory().getDistributor(distributorKey);
-        final AxContextModel albumsModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-        distributor.registerModel(albumsModel);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Runnable#run()
-     */
-    @Override
-    public void run() {
-        LOGGER.info("running TestConcurrentContextThread_" + jvm + "_" + instance + " . . .");
-
-        ContextAlbum lTypeAlbum = null;
-
-        try {
-            lTypeAlbum = distributor.createContextAlbum(new AxArtifactKey("LTypeContextAlbum", "0.0.1"));
-        } catch (final Exception e) {
-            LOGGER.error("could not get the test context album", e);
-            LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-            return;
-        }
-
-        if (lTypeAlbum == null) {
-            LOGGER.error("could not find the test context album");
-            LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-            return;
-        }
-
-        // @formatter:off
-        final AxArtifactKey[] usedArtifactStackArray = {new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"), new AxArtifactKey("testC-bot", "0.0.1")};
-        // @formatter:on
-
-        lTypeAlbum.setUserArtifactStack(usedArtifactStackArray);
-
-        try {
-            updateAlbum(lTypeAlbum);
-        } catch (final Exception exception) {
-            LOGGER.error("could not set the value in the test context album", exception);
-            LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-            return;
-        }
-
-        try {
-            lTypeAlbum.lockForWriting("testValue");
-            final TestContextItem003 item = (TestContextItem003) lTypeAlbum.get("testValue");
-            final long value = item.getLongValue();
-            LOGGER.info("completed TestConcurrentContextThread_" + jvm + "_" + instance + ", value=" + value);
-        } catch (final Exception e) {
-            LOGGER.error("could not read the value in the test context album", e);
-            LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-        } finally {
-            try {
-                lTypeAlbum.unlockForWriting("testValue");
-                distributor.shutdown();
-            } catch (final ContextException e) {
-                LOGGER.error("could not unlock test context album item", e);
-                LOGGER.error("failed TestConcurrentContextThread_" + jvm + "_" + instance);
-            }
-        }
-    }
-
-    private void updateAlbum(final ContextAlbum lTypeAlbum) throws Exception {
-        for (int i = 0; i < threadLoops; i++) {
-            try {
-                lTypeAlbum.lockForWriting("testValue");
-                TestContextItem003 item = (TestContextItem003) lTypeAlbum.get("testValue");
-                if (item != null) {
-                    long value = item.getLongValue();
-                    item.setLongValue(++value);
-                } else {
-                    item = new TestContextItem003(0L);
-                }
-                lTypeAlbum.put("testValue", item);
-            } finally {
-                lTypeAlbum.unlockForWriting("testValue");
-            }
-        }
-    }
-}
diff --git a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/package-info.java b/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/package-info.java
deleted file mode 100644
index 0e80e611d..000000000
--- a/context/context-test/src/main/java/org/onap/policy/apex/context/test/locking/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains tests to check APEX context album distributed locking.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.context.test.locking;
diff --git a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java b/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java
deleted file mode 100644
index 7d5693d5a..000000000
--- a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Test;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-public class TestContextAlbumUpdate {
-    // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextAlbumUpdate.class);
-
-    @Test
-    public void testContextAlbumUpdateJVMLocalVarSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextAlbumUpdateJVMLocalVarSet test . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor");
-        new ContextAlbumUpdate().testContextAlbumUpdate();
-
-        logger.debug("Ran testContextAlbumUpdateJVMLocalVarSet test");
-    }
-
-    @Test
-    public void testContextAlbumUpdateJVMLocalVarNotSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextAlbumUpdateJVMLocalVarNotSet test . . .");
-
-        new ContextParameters();
-        new ContextAlbumUpdate().testContextAlbumUpdate();
-
-        logger.debug("Ran testContextAlbumUpdateJVMLocalVarNotSet test");
-    }
-
-    /**
-     * Test context update cleardown.
-     */
-    @After
-    public void testContextAlbumUpdateCleardown() {}
-}
diff --git a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java b/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java
deleted file mode 100644
index f640b339e..000000000
--- a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextInstantiation.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class TestContextInstantiation {
-    // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextInstantiation.class);
-
-    @Before
-    public void beforeTest() {}
-
-    /**
-     * Test context instantiation clear down.
-     */
-    @After
-    public void afterTest() {}
-
-    @Test
-    public void testContextInstantiationJVMLocalVarSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextInstantiationJVMLocalVarSet test . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor");
-        new ContextInstantiation().testContextInstantiation();
-
-        logger.debug("Ran testContextInstantiationJVMLocalVarSet test");
-    }
-
-    @Test
-    public void testContextInstantiationJVMLocalVarNotSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextInstantiationJVMLocalVarNotSet test . . .");
-
-        new ContextParameters();
-        new ContextInstantiation().testContextInstantiation();
-
-        logger.debug("Ran testContextInstantiationJVMLocalVarNotSet test");
-    }
-
-}
diff --git a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java b/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java
deleted file mode 100644
index d140b0da1..000000000
--- a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextUpdate.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class TestContextUpdate {
-    // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextUpdate.class);
-
-    @Test
-    public void testContextUpdateJVMLocalVarSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextUpdateJVMLocalVarSet test . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor");
-        new ContextUpdate().testContextUpdate();
-
-        logger.debug("Ran testContextUpdateJVMLocalVarSet test");
-    }
-
-    @Test
-    public void testContextUpdateJVMLocalVarNotSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testContextUpdateJVMLocalVarNotSet test . . .");
-
-        new ContextParameters();
-        new ContextUpdate().testContextUpdate();
-
-        logger.debug("Ran testContextUpdateJVMLocalVarNotSet test");
-    }
-}
diff --git a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java b/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java
deleted file mode 100644
index 27987595c..000000000
--- a/context/context-test/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.distribution;
-
-
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestContextInstantiation.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class TestSequentialContextInstantiation {
-    // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestSequentialContextInstantiation.class);
-
-    @Before
-    public void beforeTest() {}
-
-    @After
-    public void afterTest() {}
-
-    @Test
-    public void testSequentialContextInstantiationJVMLocalVarSet()
-            throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testSequentialContextInstantiationJVMLocalVarSet test . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor");
-        new SequentialContextInstantiation().testSequentialContextInstantiation();
-
-        logger.debug("Ran testSequentialContextInstantiationJVMLocalVarSet test");
-    }
-
-    @Test
-    public void testSequentialContextInstantiationJVMLocalVarNotSet()
-            throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testSequentialContextInstantiationJVMLocalVarNotSet test . . .");
-
-        new ContextParameters();
-        new SequentialContextInstantiation().testSequentialContextInstantiation();
-
-        logger.debug("Ran testSequentialContextInstantiationJVMLocalVarNotSet test");
-    }
-}
diff --git a/context/context-test/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java b/context/context-test/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java
deleted file mode 100644
index 0f6626ff1..000000000
--- a/context/context-test/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.locking;
-
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestConcurrentContext tests concurrent use of context.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class TestConcurrentContext {
-    // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestConcurrentContext.class);
-
-    // Test parameters
-    private static final int TEST_JVM_COUNT_SINGLE_JVM = 1;
-    private static final int TEST_JVM_COUNT_MULTI_JVM = 3;
-    private static final int TEST_THREAD_COUNT_SINGLE_JVM = 64;
-    private static final int TEST_THREAD_COUNT_MULTI_JVM = 20;
-    private static final int TEST_THREAD_LOOPS = 100;
-
-    @Test
-    public void testConcurrentContextJVMLocalVarSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testConcurrentContextJVMLocalVarSet test . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getLockManagerParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.locking.jvmlocal.JVMLocalLockManager");
-        final long result = new ConcurrentContext().testConcurrentContext("JVMLocalVarSet", TEST_JVM_COUNT_SINGLE_JVM,
-                TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS);
-
-        assertEquals(TEST_JVM_COUNT_SINGLE_JVM * TEST_THREAD_COUNT_SINGLE_JVM * TEST_THREAD_LOOPS, result);
-
-        logger.debug("Ran testConcurrentContextJVMLocalVarSet test");
-    }
-
-    @Test
-    public void testConcurrentContextJVMLocalNoVarSet() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testConcurrentContextJVMLocalNoVarSet test . . .");
-
-        new ContextParameters();
-        final long result = new ConcurrentContext().testConcurrentContext("JVMLocalNoVarSet", TEST_JVM_COUNT_SINGLE_JVM,
-                TEST_THREAD_COUNT_SINGLE_JVM, TEST_THREAD_LOOPS);
-
-        assertEquals(TEST_JVM_COUNT_SINGLE_JVM * TEST_THREAD_COUNT_SINGLE_JVM * TEST_THREAD_LOOPS, result);
-
-        logger.debug("Ran testConcurrentContextJVMLocalNoVarSet test");
-    }
-
-    @Test
-    public void testConcurrentContextMultiJVMNoLock() throws ApexModelException, IOException, ApexException {
-        logger.debug("Running testConcurrentContextMultiJVMNoLock test . . .");
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.getDistributorParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor");
-        contextParameters.getLockManagerParameters()
-                .setPluginClass("org.onap.policy.apex.context.impl.locking.jvmlocal.JVMLocalLockManager");
-
-        final long result = new ConcurrentContext().testConcurrentContext("testConcurrentContextMultiJVMNoLock",
-                TEST_JVM_COUNT_MULTI_JVM, TEST_THREAD_COUNT_MULTI_JVM, TEST_THREAD_LOOPS);
-
-        // No concurrent map so result will be zero
-        assertEquals(0, result);
-
-        logger.debug("Ran testConcurrentContextMultiJVMNoLock test");
-    }
-}
diff --git a/context/context-test/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java b/context/context-test/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java
deleted file mode 100644
index db1ac47fe..000000000
--- a/context/context-test/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.context.test.persistence;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.context.ContextAlbum;
-import org.onap.policy.apex.context.Distributor;
-import org.onap.policy.apex.context.impl.distribution.DistributorFactory;
-import org.onap.policy.apex.context.parameters.ContextParameters;
-import org.onap.policy.apex.context.parameters.PersistorParameters;
-import org.onap.policy.apex.context.test.concepts.TestContextItem003;
-import org.onap.policy.apex.context.test.concepts.TestContextItem008;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00A;
-import org.onap.policy.apex.context.test.concepts.TestContextItem00C;
-import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.dao.ApexDao;
-import org.onap.policy.apex.model.basicmodel.dao.ApexDaoFactory;
-import org.onap.policy.apex.model.basicmodel.dao.DAOParameters;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
-
-/**
- * The Class TestContextInstantiation.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class TestPersistentContextInstantiation {
-    // Logger for this class
-    // private static final XLogger logger = XLoggerFactory.getXLogger(TestPersistentContextInstantiation.class);
-
-    private Connection connection;
-
-    @Before
-    public void setup() throws Exception {
-        Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
-        connection = DriverManager.getConnection("jdbc:derby:memory:apex_test;create=true");
-    }
-
-    @After
-    public void teardown() throws Exception {
-        connection.close();
-        new File("derby.log").delete();
-    }
-
-    @After
-    public void afterTest() throws IOException {}
-
-    @Test
-    public void testContextPersistentInstantiation() throws ApexModelException, IOException, ApexException {
-
-        final ContextParameters contextParameters = new ContextParameters();
-        contextParameters.setPersistorParameters(new PersistorParameters());
-
-        final AxArtifactKey distributorKey = new AxArtifactKey("AbstractDistributor", "0.0.1");
-        final Distributor contextDistributor = new DistributorFactory().getDistributor(distributorKey);
-
-        final AxArtifactKey[] usedArtifactStackArray = { new AxArtifactKey("testC-top", "0.0.1"),
-                new AxArtifactKey("testC-next", "0.0.1"), new AxArtifactKey("testC-bot", "0.0.1") };
-
-        final DAOParameters daoParameters = new DAOParameters();
-        daoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao");
-        daoParameters.setPersistenceUnit("DAOTest");
-        final ApexDao apexDao = new ApexDaoFactory().createApexDao(daoParameters);
-        apexDao.init(daoParameters);
-
-        final AxContextModel someContextModel = TestContextAlbumFactory.createMultiAlbumsContextModel();
-
-        // Context for Storing Map values
-        final AxContextAlbum axContextAlbumForMap =
-                someContextModel.getAlbums().getAlbumsMap().get(new AxArtifactKey("MapContextAlbum", "0.0.1"));
-        apexDao.create(axContextAlbumForMap);
-        contextDistributor.registerModel(someContextModel);
-        final ContextAlbum contextAlbumForMap = contextDistributor.createContextAlbum(axContextAlbumForMap.getKey());
-        assertNotNull(contextAlbumForMap);
-        contextAlbumForMap.setUserArtifactStack(usedArtifactStackArray);
-
-        final Map<String, String> testMap = new HashMap<String, String>();
-        testMap.put("key", "This is a policy context string");
-
-        final Map<String, Object> valueMap0 = new HashMap<String, Object>();
-        valueMap0.put("TestPolicyContextItem000", new TestContextItem00C(testMap));
-
-        contextAlbumForMap.putAll(valueMap0);
-
-        assertEquals(((TestContextItem00C) contextAlbumForMap.get("TestPolicyContextItem000")).getMapValue().get("key"),
-                "This is a policy context string");
-
-        contextAlbumForMap.flush();
-
-        // Context for Storing Date values
-        final AxContextAlbum axContextAlbumForDate =
-                someContextModel.getAlbums().getAlbumsMap().get(new AxArtifactKey("DateContextAlbum", "0.0.1"));
-        apexDao.create(axContextAlbumForDate);
-        contextDistributor.registerModel(someContextModel);
-        final ContextAlbum contextAlbumForDate = contextDistributor.createContextAlbum(axContextAlbumForDate.getKey());
-        assertNotNull(contextAlbumForDate);
-        contextAlbumForDate.setUserArtifactStack(usedArtifactStackArray);
-
-        final TestContextItem008 testDate = new TestContextItem008(new Date());
-        final TestContextItem00A tci00A = new TestContextItem00A();
-        tci00A.setDateValue(testDate);
-        tci00A.setTZValue(TimeZone.getTimeZone("Europe/Dublin").toString());
-        tci00A.setDST(true);
-
-        final Map<String, Object> valueMap1 = new HashMap<String, Object>();
-        valueMap1.put("TestPolicyContextItem00A", tci00A);
-
-        contextAlbumForDate.putAll(valueMap1);
-
-        assertEquals(((TestContextItem00A) contextAlbumForDate.get("TestPolicyContextItem00A")).getDateValue(),
-                testDate);
-        assertEquals(((TestContextItem00A) contextAlbumForDate.get("TestPolicyContextItem00A")).getDST(), true);
-
-        contextAlbumForDate.flush();
-
-        // Context for Storing Long values
-        final AxContextAlbum axContextAlbumForLong =
-                someContextModel.getAlbums().getAlbumsMap().get(new AxArtifactKey("LTypeContextAlbum", "0.0.1"));
-        apexDao.create(axContextAlbumForLong);
-        contextDistributor.registerModel(someContextModel);
-        final ContextAlbum contextAlbumForLong = contextDistributor.createContextAlbum(axContextAlbumForLong.getKey());
-        assertNotNull(contextAlbumForLong);
-        contextAlbumForLong.setUserArtifactStack(usedArtifactStackArray);
-
-        final Map<String, Object> valueMap2 = new HashMap<String, Object>();
-        valueMap2.put("TestPolicyContextItem0031", new TestContextItem003(0xFFFFFFFFFFFFFFFFL));
-        valueMap2.put("TestPolicyContextItem0032", new TestContextItem003(0xFFFFFFFFFFFFFFFEL));
-        valueMap2.put("TestPolicyContextItem0033", new TestContextItem003(0xFFFFFFFFFFFFFFFDL));
-        valueMap2.put("TestPolicyContextItem0034", new TestContextItem003(0xFFFFFFFFFFFFFFFCL));
-        valueMap2.put("TestPolicyContextItem0035", new TestContextItem003(0xFFFFFFFFFFFFFFFBL));
-
-        contextAlbumForLong.putAll(valueMap2);
-
-        assertEquals(((TestContextItem003) contextAlbumForLong.get("TestPolicyContextItem0031")).getLongValue(),
-                0xFFFFFFFFFFFFFFFFL);
-        assertEquals(((TestContextItem003) contextAlbumForLong.get("TestPolicyContextItem0032")).getLongValue(),
-                0xFFFFFFFFFFFFFFFEL);
-        assertEquals(((TestContextItem003) contextAlbumForLong.get("TestPolicyContextItem0033")).getLongValue(),
-                0xFFFFFFFFFFFFFFFDL);
-        assertEquals(((TestContextItem003) contextAlbumForLong.get("TestPolicyContextItem0034")).getLongValue(),
-                0xFFFFFFFFFFFFFFFCL);
-        assertEquals(((TestContextItem003) contextAlbumForLong.get("TestPolicyContextItem0035")).getLongValue(),
-                0xFFFFFFFFFFFFFFFBL);
-
-        contextAlbumForLong.flush();
-        contextDistributor.clear();
-
-    }
-}
diff --git a/context/context-test/src/test/resources/META-INF/persistence.xml b/context/context-test/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index ec9357851..000000000
--- a/context/context-test/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. 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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
-    <persistence-unit name="DAOTest" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-
-        <class>org.onap.policy.apex.model.basicmodel.dao.converters.CDATAConditioner</class>
-        <class>org.onap.policy.apex.model.basicmodel.dao.converters.UUID2String</class>
-        <class>org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey</class>
-        <class>org.onap.policy.apex.model.basicmodel.concepts.AxConcept</class>
-        <class>org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo</class>
-        <class>org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation</class>
-        <class>org.onap.policy.apex.model.basicmodel.concepts.AxModel</class>
-        <class>org.onap.policy.apex.model.basicmodel.concepts.TestEntity</class>
-        <class>org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema</class>
-        <class>org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas</class>
-        <class>org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum</class>
-        <class>org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums</class>
-        <class>org.onap.policy.apex.model.contextmodel.concepts.AxContextModel</class>
-
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:apex_test" />
-            <property name="javax.persistence.target-database" value="Derby" />
-            <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-            <property name="eclipselink.logging.level" value="INFO" />
-        </properties>
-    </persistence-unit>
-</persistence>