diff --git a/domiSMP-ui-tests/src/main/resources/docker-firefox.properties b/domiSMP-ui-tests/src/main/resources/docker-firefox.properties
deleted file mode 100644
index 439ef88129b9d2aa8e942f1652106ba7e00b6f6f..0000000000000000000000000000000000000000
--- a/domiSMP-ui-tests/src/main/resources/docker-firefox.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# docker parameters for the selenium.
-test.webdriver.path=/usr/bin/geckodriver
-test.webdriver.type=firefox
-
-test.webdriver.headless=true
-test.application.ui.url=http://eulogin.protected.smp.local:8080/smp/ui
-test.sml.url=http://eulogin.protected.smp.local:8080/edelivery-sml/listDNS
-test.timeout.long=15
-test.timeout.short=5
-test.reports.folder=./reports/
-
-# test specific properties
-test.user.SYSTEM_ADMIN.username=system
-test.user.SYSTEM_ADMIN.password=123456
-test.user.USER.username=user
-test.user.USER.password=123456
-test.data.password.default=QW!@QW!@qw12qw12
-test.data.password.new=Test1234!Test1234!
diff --git a/smp-docker/compose/weblogic-oracle14/.env b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/.env
similarity index 79%
rename from smp-docker/compose/weblogic-oracle14/.env
rename to domismp-tests/domismp-docker/compose/domismp-springboot-mysql/.env
index 955cbd9eab845319b73dcd2dcbece2ef12238ce5..df7ed4c3f264de2cf6fdb274c2e84b98d5d5f223 100644
--- a/smp-docker/compose/weblogic-oracle14/.env
+++ b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/.env
@@ -1,3 +1,3 @@
 # The .env file is the default method for setting environment variables in the containers. For more
 # information, see https://docs.docker.com/compose/environment-variables/env-file/
-COMPOSE_PROJECT_NAME=smp-wls141-oradb
+COMPOSE_PROJECT_NAME=domismp-springboot-mysql
diff --git a/smp-docker/compose/sprinboot-mysql-smp/README.md b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/README.md
similarity index 100%
rename from smp-docker/compose/sprinboot-mysql-smp/README.md
rename to domismp-tests/domismp-docker/compose/domismp-springboot-mysql/README.md
diff --git a/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.test-api.yml b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.test-api.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e5a7512a750cce3ce4950569412e3a16ac346b14
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.test-api.yml
@@ -0,0 +1,16 @@
+version: '3.8'
+services:
+  ##
+  ## UI Tests
+  ##
+  testui:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
+    environment:
+      - TEST_PLAN=api
+      - TEST_URL=http://smp-springboot-mysql.local:8084/smp/
+    networks:
+      - test-network
+networks:
+  test-network:
+    external:
+      name: ${DOCKER_NETWORK_NAME:-domismp-springboot-mysql_default}
diff --git a/smp-docker/compose/sprinboot-mysql-smp/docker-compose.yml b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.yml
similarity index 92%
rename from smp-docker/compose/sprinboot-mysql-smp/docker-compose.yml
rename to domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.yml
index 7e57db47b58c162a94fd47d84f0ff0a4262d216d..b140673d82f521f7b6865764d53a7c9d16b5f2fd 100644
--- a/smp-docker/compose/sprinboot-mysql-smp/docker-compose.yml
+++ b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.0"
 services:
   smp-springboot:
     image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_SPRINGBOOT_MYSQL}:${SMP_VERSION}
-    container_name: smp-springboot-mysql
+    hostname: smp-springboot-mysql.local
     environment:
       - SMP_INIT_PROPERTIES=smp.passwordPolicy.expired.forceChange=false
         ||smp.automation.authentication.external.tls.SSLClientCert.enabled=true
@@ -24,12 +24,12 @@ services:
     volumes:
       - ./properties/db-scripts:/tmp/custom-data/
       - ./properties/keystores:/tmp/keystores/
-    ports:
-      - "8282:8084"
+#    ports:
+#      - "8282:8084"
 #      - "3208:3306"
 #      - "5005:5005"
   mail-service:
     image: inbucket/inbucket:3.0.0
     hostname: mail-server.smp.local
-    ports:
-      - "9205:9000"
+#    ports:
+#      - "9205:9000"
diff --git a/smp-docker/compose/sprinboot-mysql-smp/runCompose.sh b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runCompose.sh
similarity index 68%
rename from smp-docker/compose/sprinboot-mysql-smp/runCompose.sh
rename to domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runCompose.sh
index 33ba8220ff5e71c63d804a69968d3c48195dc8a9..de5df932e8a1b0dda6131ebfcbf9b8859fb38969 100755
--- a/smp-docker/compose/sprinboot-mysql-smp/runCompose.sh
+++ b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runCompose.sh
@@ -1,23 +1,13 @@
 #!/bin/bash
 
-
+# init plan variables
 WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-#load common functions
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions"
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
-[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
-initializeCommonVariables
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
 
 SMP_INIT_DATABASE="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl"
 #SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql"
 SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql"
-# soap ui data
-SMP_VERSION=
-
 
 # READ arguments
 while getopts i:v: option
@@ -57,6 +47,4 @@ stopAndClearTestContainers
 echo "Start containers"
 startTestContainers
 
-# wait until service is up
-for i in `seq 100`; do timeout 1  bash -c 'curl --silent --fail http://localhost:8282/smp/'; if [ $? -eq 0  ] ; then break;fi; echo "$i. Wait for tomcat to start!";  sleep 5;  done;
 
diff --git a/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runTestsAPI.sh b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runTestsAPI.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3ac25a02da256741ee4c96ac01a1006b8f519bc0
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/runTestsAPI.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# init plan variables
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+RESULT_FOLDER="${WORKDIR}/results"
+# clear old results
+rm -rf "${RESULT_FOLDER}"
+mkdir -p "${RESULT_FOLDER}"
+
+# define network to connect the tests
+DOCKER_NETWORK_NAME="${PLAN_PREFIX}_default"
+export DOCKER_NETWORK_NAME
+
+# Starting Docker Compose TEST (in specific project to avoid orphan container warning)
+docker compose -f docker-compose.test-api.yml -p "run-${PLAN_PREFIX}" up
+docker cp "run-${PLAN_PREFIX}-testapi-1:/data/results/soapui-reports" ./results
diff --git a/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/stopClearCompose.sh b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/stopClearCompose.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2a2f4abce435c63e4eff0d9847a25cf5c0896d12
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-springboot-mysql/stopClearCompose.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# init plan variables
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+echo "Clear old containers"
+stopAndClearTestContainers
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/.env b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/.env
similarity index 81%
rename from smp-docker/compose/tomcat-mysql-smp-sml/.env
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/.env
index 63736b8a41bc6545a381ae8dffc1bddbdc463e7e..aa916a431dac6860bd6990b53b0a29cad9519cfc 100644
--- a/smp-docker/compose/tomcat-mysql-smp-sml/.env
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/.env
@@ -1,3 +1,3 @@
 # The .env file is the default method for setting environment variables in the containers. For more
 # information, see https://docs.docker.com/compose/environment-variables/env-file/
-COMPOSE_PROJECT_NAME=smp-tomcat-mysql
+COMPOSE_PROJECT_NAME=domismp-tomcat-mysql
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/README.md b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/README.md
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/README.md
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/README.md
diff --git a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-api.yml b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-api.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8e332913696b6438ba3697186f9a02ce8f81571e
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-api.yml
@@ -0,0 +1,16 @@
+version: '3.8'
+services:
+  ##
+  ## UI Tests
+  ##
+  testui:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
+    environment:
+      - TEST_PLAN=api
+      - TEST_URL=http://eulogin.protected.smp.local:8080/smp/
+    networks:
+      - test-network
+networks:
+  test-network:
+    external:
+      name: ${DOCKER_NETWORK_NAME:-domismp-tomcat-mysql_default}
diff --git a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-ui.yml b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-ui.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6fde6c93c6a80aff41dcdbe4ab5024f6b5882f84
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.test-ui.yml
@@ -0,0 +1,17 @@
+version: '3.8'
+services:
+  ##
+  ## UI Tests
+  ##
+  testui:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
+    environment:
+      - TEST_PLAN=ui
+      - TEST_APPLICATION_UI_URL=http://eulogin.protected.smp.local:8080/smp/ui/
+      - TEST_SML_URL=http://eulogin.protected.smp.local:8080/edelivery-sml/listDNS
+    networks:
+      - test-network
+networks:
+  test-network:
+    external:
+      name: ${DOCKER_NETWORK_NAME:-domismp-tomcat-mysql_default}
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.yml b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml
similarity index 86%
rename from smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.yml
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml
index 89431cd3381b855eebdc7cba3d85466ccace80af..eb1cd7d7636f311d90863201473a7cc372a4c82a 100644
--- a/smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.yml
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml
@@ -29,10 +29,10 @@ services:
     volumes:
       - ./properties/db-scripts:/tmp/custom-data/
       - ./properties/keystores:/tmp/keystores/
-    ports:
-      - "3908:3306"
-      - "8982:8080"
-      - "6902:6901"
+#    ports:
+#      - "3908:3306"
+#      - "8982:8080"
+#      - "6902:6901"
 #      - "8953:53"
 #      - "5005:5005"
 
@@ -41,13 +41,13 @@ services:
     hostname: eulogin-mock-server
     volumes:
         - ./eulogin/init-data:/resources/ecas-mock-server
- # Map this folder to host to be able to change runtime data for manual testing!
- #       - ./eulogin/ecas-mock-server:/data/ecas-mock-server
-    ports:
-      - "7102:7102"
+# Map this folder to host to be able to change runtime data for manual testing!
+#       - ./eulogin/ecas-mock-server:/data/ecas-mock-server
+#    ports:
+#      - "7102:7102"
 
   mail-service:
     image: inbucket/inbucket:3.0.0
     hostname: mail-server.smp.local
-    ports:
-      - "9005:9000"
+#    ports:
+#      - "9005:9000"
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/ecas-mock-server/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/ecas-mock-server/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/eulogin/ecas-mock-server/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/ecas-mock-server/.disable_default_excludes
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/ecas-mock-server/.gitignore b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/ecas-mock-server/.gitignore
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/eulogin/ecas-mock-server/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/ecas-mock-server/.gitignore
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/ecas-config-smp.properties b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/init-data/ecas-config-smp.properties
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/ecas-config-smp.properties
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/init-data/ecas-config-smp.properties
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/ecas.properties b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/init-data/ecas.properties
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/ecas.properties
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/init-data/ecas.properties
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/userDataBase.xml b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/init-data/userDataBase.xml
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/eulogin/init-data/userDataBase.xml
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/eulogin/init-data/userDataBase.xml
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/properties/db-scripts/sml-mysql5innodb-data.sql b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/properties/db-scripts/sml-mysql5innodb-data.sql
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/properties/db-scripts/sml-mysql5innodb-data.sql
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/properties/db-scripts/sml-mysql5innodb-data.sql
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/properties/keystores/smp-eulogin-mock.p12 b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/properties/keystores/smp-eulogin-mock.p12
similarity index 100%
rename from smp-docker/compose/tomcat-mysql-smp-sml/properties/keystores/smp-eulogin-mock.p12
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/properties/keystores/smp-eulogin-mock.p12
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runCompose.sh
similarity index 75%
rename from smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh
rename to domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runCompose.sh
index 3f80fa1d95dc4debb75a6fd4042d2bf1cfeed3a7..9b432d0225eec784d961b9bbf872cdee19a59a4e 100755
--- a/smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runCompose.sh
@@ -1,21 +1,13 @@
 #!/bin/bash
 
+# init plan variables
 WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-#load common functions
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions"
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
-[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
-
-initializeCommonVariables
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
 
 SMP_INIT_DATABASE="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl"
 #SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-data.sql"
 SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql"
-SMP_VERSION=
 # READ arguments
 while getopts i:v: option
 do
@@ -26,8 +18,6 @@ do
   esac
 done
 
-discoverApplicationVersion
-
 echo "*****************************************************************"
 echo "* Start SMP image for version: [$SMP_VERSION]"
 echo "* Plan prefix: [${PLAN_PREFIX}]"
diff --git a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsAPI.sh b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsAPI.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3ac25a02da256741ee4c96ac01a1006b8f519bc0
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsAPI.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# init plan variables
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+RESULT_FOLDER="${WORKDIR}/results"
+# clear old results
+rm -rf "${RESULT_FOLDER}"
+mkdir -p "${RESULT_FOLDER}"
+
+# define network to connect the tests
+DOCKER_NETWORK_NAME="${PLAN_PREFIX}_default"
+export DOCKER_NETWORK_NAME
+
+# Starting Docker Compose TEST (in specific project to avoid orphan container warning)
+docker compose -f docker-compose.test-api.yml -p "run-${PLAN_PREFIX}" up
+docker cp "run-${PLAN_PREFIX}-testapi-1:/data/results/soapui-reports" ./results
diff --git a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsUI.sh b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsUI.sh
new file mode 100755
index 0000000000000000000000000000000000000000..09ac3e3bd6eecb64e8902a7b14e21068bb1e2eaf
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/runTestsUI.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+
+RESULT_FOLDER="${WORKDIR}/results"
+# clear old results
+rm -rf "${RESULT_FOLDER}"
+mkdir -p "${RESULT_FOLDER}"
+
+# define network to connect the tests
+DOCKER_NETWORK_NAME="${PLAN_PREFIX}_default"
+export DOCKER_NETWORK_NAME
+
+# Starting Docker Compose TEST (in specific project to avoid orphan container warning)
+docker compose -f docker-compose.test-ui.yml -p "run-${PLAN_PREFIX}" up
+docker cp "run-${PLAN_PREFIX}-testui-1:/data/results/surefire-reports" ./results
diff --git a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/stopClearCompose.sh b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/stopClearCompose.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e989749895d68ad9607ff1e429ab11b5b012eb2d
--- /dev/null
+++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/stopClearCompose.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# init plan variables
+WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
+
+echo "Clear old containers"
+stopAndClearTestContainers
+
diff --git a/smp-docker/compose/weblogic-oracle/.env b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/.env
similarity index 81%
rename from smp-docker/compose/weblogic-oracle/.env
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/.env
index 70a7518accc480f2ac6c4b2cfe9ab27f6ceec582..ae8ca309c3c39e7b8361086e29f53d04618d4eed 100644
--- a/smp-docker/compose/weblogic-oracle/.env
+++ b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/.env
@@ -1,3 +1,3 @@
 # The .env file is the default method for setting environment variables in the containers. For more
 # information, see https://docs.docker.com/compose/environment-variables/env-file/
-COMPOSE_PROJECT_NAME=smp-wls122-oradb
+COMPOSE_PROJECT_NAME=domismp-wls122-oradb
diff --git a/smp-docker/compose/weblogic-oracle/README.md b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/README.md
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/README.md
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/README.md
diff --git a/smp-docker/compose/weblogic-oracle/data/smp/config/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/config/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/smp/config/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/config/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle/data/smp/config/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/config/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/smp/config/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/config/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle/data/smp/security/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/security/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/smp/security/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/security/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle/data/smp/security/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/security/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/smp/security/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/smp/security/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle/data/upload/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/upload/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/upload/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/upload/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle/data/upload/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/upload/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/upload/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/upload/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle/data/weblogic/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/weblogic/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle/data/weblogic/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/weblogic/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle/data/weblogic/keystores/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/keystores/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/weblogic/keystores/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/keystores/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle/data/weblogic/keystores/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/keystores/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/data/weblogic/keystores/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/data/weblogic/keystores/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle/docker-compose.yml b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/docker-compose.yml
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/docker-compose.yml
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/docker-compose.yml
diff --git a/smp-docker/compose/weblogic-oracle/properties/weblogic-init/datasource.properties b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/datasource.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/properties/weblogic-init/datasource.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/datasource.properties
diff --git a/smp-docker/compose/weblogic-oracle/properties/weblogic-init/domain.properties b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/domain.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/properties/weblogic-init/domain.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/domain.properties
diff --git a/smp-docker/compose/weblogic-oracle/properties/weblogic-init/domain_security.properties b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/domain_security.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/properties/weblogic-init/domain_security.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/domain_security.properties
diff --git a/smp-docker/compose/weblogic-oracle/properties/weblogic-init/smp.config.properties b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/smp.config.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/properties/weblogic-init/smp.config.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/properties/weblogic-init/smp.config.properties
diff --git a/smp-docker/compose/weblogic-oracle/runCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/runCompose.sh
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/runCompose.sh
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/runCompose.sh
diff --git a/smp-docker/compose/weblogic-oracle/status-folder/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/status-folder/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/status-folder/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/status-folder/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle/status-folder/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/status-folder/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/status-folder/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/status-folder/.gitignore
diff --git a/smp-docker/compose/sprinboot-mysql-smp/stopClearCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/stopClearCompose.sh
similarity index 100%
rename from smp-docker/compose/sprinboot-mysql-smp/stopClearCompose.sh
rename to domismp-tests/domismp-docker/compose/domismp-wls122-oradb/stopClearCompose.sh
diff --git a/smp-docker/compose/sprinboot-mysql-smp/.env b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/.env
similarity index 81%
rename from smp-docker/compose/sprinboot-mysql-smp/.env
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/.env
index 941e84c41f4e8dded7abb295c1a88053cf2585c6..d3fbb5350ecd0a4666157defb50ff1435362b26d 100644
--- a/smp-docker/compose/sprinboot-mysql-smp/.env
+++ b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/.env
@@ -1,3 +1,3 @@
 # The .env file is the default method for setting environment variables in the containers. For more
 # information, see https://docs.docker.com/compose/environment-variables/env-file/
-COMPOSE_PROJECT_NAME=smp-springboot-mysql
+COMPOSE_PROJECT_NAME=domismp-wls141-oradb
diff --git a/smp-docker/compose/weblogic-oracle14/README.md b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/README.md
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/README.md
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/README.md
diff --git a/smp-docker/compose/weblogic-oracle14/data/smp/config/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/config/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/smp/config/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/config/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle14/data/smp/config/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/config/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/smp/config/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/config/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle14/data/smp/security/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/security/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/smp/security/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/security/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle14/data/smp/security/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/security/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/smp/security/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/smp/security/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle14/data/upload/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/upload/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/upload/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/upload/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle14/data/upload/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/upload/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/upload/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/upload/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle14/data/weblogic/keystores/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/weblogic/keystores/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/weblogic/keystores/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/weblogic/keystores/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle14/data/weblogic/keystores/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/weblogic/keystores/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/data/weblogic/keystores/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/data/weblogic/keystores/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle14/docker-compose.yml b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/docker-compose.yml
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/docker-compose.yml
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/docker-compose.yml
diff --git a/smp-docker/compose/weblogic-oracle14/properties/db-scripts/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/db-scripts/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/properties/db-scripts/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/db-scripts/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle14/properties/db-scripts/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/db-scripts/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/properties/db-scripts/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/db-scripts/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle14/properties/weblogic-init/datasource.properties b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/datasource.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/properties/weblogic-init/datasource.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/datasource.properties
diff --git a/smp-docker/compose/weblogic-oracle14/properties/weblogic-init/domain.properties b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/domain.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/properties/weblogic-init/domain.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/domain.properties
diff --git a/smp-docker/compose/weblogic-oracle14/properties/weblogic-init/domain_security.properties b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/domain_security.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/properties/weblogic-init/domain_security.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/domain_security.properties
diff --git a/smp-docker/compose/weblogic-oracle14/properties/weblogic-init/smp.config.properties b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/smp.config.properties
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/properties/weblogic-init/smp.config.properties
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/properties/weblogic-init/smp.config.properties
diff --git a/smp-docker/compose/weblogic-oracle14/runCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/runCompose.sh
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/runCompose.sh
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/runCompose.sh
diff --git a/smp-docker/compose/weblogic-oracle14/status-folder/.disable_default_excludes b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/status-folder/.disable_default_excludes
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/status-folder/.disable_default_excludes
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/status-folder/.disable_default_excludes
diff --git a/smp-docker/compose/weblogic-oracle14/status-folder/.gitignore b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/status-folder/.gitignore
similarity index 100%
rename from smp-docker/compose/weblogic-oracle14/status-folder/.gitignore
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/status-folder/.gitignore
diff --git a/smp-docker/compose/weblogic-oracle/stopClearCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/stopClearCompose.sh
similarity index 100%
rename from smp-docker/compose/weblogic-oracle/stopClearCompose.sh
rename to domismp-tests/domismp-docker/compose/domismp-wls141-oradb/stopClearCompose.sh
diff --git a/smp-docker/functions/common.functions b/domismp-tests/domismp-docker/functions/common.functions
similarity index 91%
rename from smp-docker/functions/common.functions
rename to domismp-tests/domismp-docker/functions/common.functions
index 2366491915bf379f12c8bc39cc06b63953aaf795..670020b8ebd2244924eabac1ab89da5b390b6512 100644
--- a/smp-docker/functions/common.functions
+++ b/domismp-tests/domismp-docker/functions/common.functions
@@ -20,12 +20,12 @@ exportBuildArtefactNames() {
 ################################################################
 # Function exports the DomiSMP base image names
 function exportImageNames() {
-    export IMAGE_SMP_SPRINGBOOT_MYSQL=smp-springboot-mysql
-    export IMAGE_SMP_TOMCAT_MYSQL=smp-sml-tomcat-mysql
-    export IMAGE_SMP_WEBLOGIC122=smp-weblogic-122
-    export IMAGE_SMP_WEBLOGIC14=smp-weblogic-141
-    export IMAGE_SMP_BD_ORACLE=smp_oradb
-    export IMAGE_SMP_TEST_UI=smp-test-ui
+    export IMAGE_SMP_SPRINGBOOT_MYSQL=domismp-springboot-mysql
+    export IMAGE_SMP_TOMCAT_MYSQL=domismp-tomcat-mysql
+    export IMAGE_SMP_WEBLOGIC122=domismp-weblogic122
+    export IMAGE_SMP_WEBLOGIC14=domismp-weblogic141
+    export IMAGE_SMP_BD_ORACLE=domismp-oradb
+    export IMAGE_SMP_TESTS=domismp-tests
 }
 
 ################################################################
diff --git a/smp-docker/functions/run-test.functions b/domismp-tests/domismp-docker/functions/run-test.functions
similarity index 59%
rename from smp-docker/functions/run-test.functions
rename to domismp-tests/domismp-docker/functions/run-test.functions
index 1fa202120855c2e718ea54eabad818405a125075..2bc016533c122b018287ee12cca5a4b74b220b02 100644
--- a/smp-docker/functions/run-test.functions
+++ b/domismp-tests/domismp-docker/functions/run-test.functions
@@ -4,6 +4,25 @@
 # tests and stop the docker compose containers.
 ################################################################
 
+################################################################
+# Function initialize environment variables and loads the common functions
+function initializeVariables() {
+  : "${WORKDIR?"Need to set WORKDIR"}"
+
+  FUNCTION_FOLDER="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
+  # project folder
+  SMP_PROJECT_FOLDER=$(readlink -e "${FUNCTION_FOLDER}/../../..")
+  #load common functions
+  source "${FUNCTION_FOLDER}/common.functions"
+  echo "Set Working Directory: ${WORKDIR}"
+  cd "${WORKDIR}" || exit 100
+  [ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
+
+  initializeCommonVariables
+  discoverApplicationVersion
+}
+
+
 ################################################################
 # Function exports the logs to file and stop and clear containers
 function stopAndClearTestContainers() {
diff --git a/smp-docker/images/build-docker-images.sh b/domismp-tests/domismp-docker/images/build-docker-images.sh
similarity index 73%
rename from smp-docker/images/build-docker-images.sh
rename to domismp-tests/domismp-docker/images/build-docker-images.sh
index 7625acf4ffb020bf6d83af10eb972eaa59e8f6f7..2562253bbcb8ac8fd240e4e402707949e67cf07f 100755
--- a/smp-docker/images/build-docker-images.sh
+++ b/domismp-tests/domismp-docker/images/build-docker-images.sh
@@ -34,7 +34,7 @@ ORA_SERVICE="xe"
 SMP_VERSION=
 ORACLE_ARTEFACTS="/CEF/repo"
 
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../..")
+SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
 SMP_ARTEFACTS="${SMP_PROJECT_FOLDER}/smp-webapp/target"
 SMP_SPRINGBOOT_ARTEFACTS="${SMP_PROJECT_FOLDER}/smp-springboot/target"
 SMP_PLUGIN_EXAMPLE="${SMP_PROJECT_FOLDER}/smp-examples/smp-spi-payload-validation-example/target"
@@ -71,6 +71,12 @@ echo "* Oracle artefact folders: [$ORACLE_ARTEFACTS]"
 echo "*****************************************************************"
 echo ""
 
+export SMP_VERSION
+export SMP_PROJECT_FOLDER
+export SMP_ARTEFACTS
+export SMP_PLUGIN_EXAMPLE
+export SMP_SPRINGBOOT_ARTEFACTS
+
 # -----------------------------------------------------------------------------
 # validate all necessary artefacts and prepare files to build images
 # -----------------------------------------------------------------------------
@@ -135,20 +141,12 @@ validateAndPrepareArtefacts() {
       cp "${ORACLE_ARTEFACTS}/${WEBLOGIC_14_FILE}" ./oracle/weblogic-14.1.1.0/
     fi
 
-  if [[ ! -d "./smp-springboot-mysql/artefacts/" ]]; then
-    mkdir -p "./smp-springboot-mysql/artefacts"
-  fi
-
-  if [[ ! -d "./tomcat-mysql-smp-sml/artefacts/" ]]; then
-      mkdir -p "./tomcat-mysql-smp-sml/artefacts"
-    fi
-
-  if [[ ! -d "./weblogic-14.1-smp/artefacts/" ]]; then
-      mkdir -p "./weblogic-14.1-smp/artefacts"
+  if [[ ! -d "./${IMAGE_SMP_WEBLOGIC14}/artefacts/" ]]; then
+      mkdir -p "./${IMAGE_SMP_WEBLOGIC14}/artefacts"
     fi
 
-  if [[ ! -d "./weblogic-12.2-smp/artefacts" ]]; then
-    mkdir -p "./weblogic-12.2-smp/artefacts"
+  if [[ ! -d "./${IMAGE_SMP_WEBLOGIC122}/artefacts" ]]; then
+    mkdir -p "./${IMAGE_SMP_WEBLOGIC122}/artefacts"
   fi
 
   # SMP artefacts
@@ -157,25 +155,13 @@ validateAndPrepareArtefacts() {
     exit 1
   else
     # copy artefact to docker build folder
-    cp -r shared-artefacts ./weblogic-12.2-smp/artefacts/
-    cp -r shared-artefacts ./weblogic-14.1-smp/artefacts/
-    cp -r shared-artefacts ./tomcat-mysql-smp-sml/artefacts/
-    cp -r shared-artefacts ./smp-springboot-mysql/artefacts/
+    cp -r shared-artefacts "./${IMAGE_SMP_WEBLOGIC122}/artefacts/"
+    cp -r shared-artefacts "./${IMAGE_SMP_WEBLOGIC14}/artefacts/"
     # for weblogic
-    cp "${SMP_ARTEFACTS}/smp.war" ./weblogic-12.2-smp/artefacts/smp.war
-    cp "${SMP_ARTEFACTS}/smp.war" ./weblogic-14.1-smp/artefacts/smp.war
-    # for mysql tomcat
-    cp "${SMP_ARTEFACTS}/smp.war" ./tomcat-mysql-smp-sml/artefacts/smp.war
+    cp "${SMP_ARTEFACTS}/smp.war" "./${IMAGE_SMP_WEBLOGIC122}/artefacts/smp.war"
+    cp "${SMP_ARTEFACTS}/smp.war" "./${IMAGE_SMP_WEBLOGIC14}/artefacts/smp.war"
   fi
 
-  # add SMP smp-springboot artefacts to smp-springboot-mysql imag
-    if [[ ! -f "${SMP_SPRINGBOOT_ARTEFACTS}/smp-springboot-$SMP_VERSION-exec.jar" ]]; then
-      echo "SMP artefact '${SMP_SPRINGBOOT_ARTEFACTS}/smp-springboot-$SMP_VERSION-exec.jar' not found!"
-      exit 1
-    else
-      # for mysql tomcat
-      cp "${SMP_SPRINGBOOT_ARTEFACTS}/smp-springboot-$SMP_VERSION-exec.jar" ./smp-springboot-mysql/artefacts/smp-springboot-exec.jar
-    fi
 
   # SMP setup zip
   if [[ ! -f "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ]]; then
@@ -183,24 +169,10 @@ validateAndPrepareArtefacts() {
     exit 1
   else
     # copy artefact to docker build folder
-    cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ./weblogic-12.2-smp/artefacts/smp-setup.zip
-    cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ./weblogic-14.1-smp/artefacts/smp-setup.zip
-    cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ./tomcat-mysql-smp-sml/artefacts/smp-setup.zip
-    cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ./smp-springboot-mysql/artefacts/smp-setup.zip
-  fi
-
-  if [[ ! -d "${SMP_PLUGIN_EXAMPLE}" ]]; then
-    echo "SMP SPI plugin '${SMP_PLUGIN_EXAMPLE}' not found. copy from artefacts ${SMP_ARTEFACTS}!"
-    ls -ltr ${SMP_ARTEFACTS}
-    cp "${SMP_ARTEFACTS}/smp-spi-payload-validation-example-$SMP_VERSION.jar" ./tomcat-mysql-smp-sml/artefacts/smp-spi-payload-validation-example.jar
-  else
-    cp "${SMP_PLUGIN_EXAMPLE}/smp-spi-payload-validation-example-$SMP_VERSION.jar" ./tomcat-mysql-smp-sml/artefacts/smp-spi-payload-validation-example.jar
+    cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" "./${IMAGE_SMP_WEBLOGIC122}/artefacts/smp-setup.zip"
+    cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" "./${IMAGE_SMP_WEBLOGIC14}/artefacts/smp-setup.zip"
   fi
 
-  # copy artefact to docker build folder
-  [[ -d  ./smp-test-ui/artefacts/domiSMP-ui-tests ]] && rm -rf ./smp-test-ui/artefacts/domiSMP-ui-tests
-  mkdir -p ./smp-test-ui/artefacts
-  cp -r "${SMP_PROJECT_FOLDER}/domiSMP-ui-tests" ./smp-test-ui/artefacts/
 }
 
 
@@ -211,39 +183,25 @@ buildImages() {
   buildOracleDatabaseImage
   buildWebLogicOracleImages12
   buildWebLogicOracleImages14
-  buildTomcatMysqlImages
-  buildSpringbootMysqlImages
   buildUtils
-  buildTestUIImages
-}
 
-buildTestUIImages() {
-  # build tomcat mysql image deployment.
-   docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TEST_UI}:${SMP_VERSION}" ./smp-test-ui/
-    if [ $? -ne 0 ]; then
-      echo "Error occurred while building image [${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TEST_UI}:${SMP_VERSION}]!"
-      exit 10
-    fi
-}
+  buildImage "${IMAGE_SMP_TOMCAT_MYSQL}"
+  buildImage "${IMAGE_SMP_SPRINGBOOT_MYSQL}"
+  buildImage "${IMAGE_SMP_TESTS}"
 
-buildSpringbootMysqlImages() {
-    # build tomcat mysql image deployment.
-  docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_SPRINGBOOT_MYSQL}:${SMP_VERSION}" ./smp-springboot-mysql/ --build-arg SMP_VERSION=${SMP_VERSION}
-  if [ $? -ne 0 ]; then
-    echo "Error occurred while building image [${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_SPRINGBOOT_MYSQL}:${SMP_VERSION}]!"
-    exit 10
-  fi
-}
 
-buildTomcatMysqlImages() {
-    # build tomcat mysql image deployment.
-  docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TOMCAT_MYSQL}:${SMP_VERSION}" ./tomcat-mysql-smp-sml/ --build-arg SMP_VERSION=${SMP_VERSION}
+}
+buildImage(){
+  echo "Build image [${IMAGE_TAG:-edeliverytest}/$1:${SMP_VERSION}]."
+  ./"$1"/build.sh
   if [ $? -ne 0 ]; then
-    echo "Error occurred while building image [${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TOMCAT_MYSQL}:${SMP_VERSION}]!"
+    echo "Error occurred while building image [${IMAGE_TAG:-edeliverytest}/$0:${SMP_VERSION}]!"
     exit 10
   fi
 }
 
+
+
 buildOracleDatabaseImage(){
   # -----------------------------------------------------------------------------
   # build docker image for oracle database
@@ -275,7 +233,7 @@ buildWebLogicOracleImages12(){
   fi
 
   # build SMP deployment.
-  docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_WEBLOGIC122}:${SMP_VERSION}" ./weblogic-12.2-smp/ --build-arg SMP_VERSION="$SMP_VERSION"
+  docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_WEBLOGIC122}:${SMP_VERSION}" ./"${IMAGE_SMP_WEBLOGIC122}"/ --build-arg SMP_VERSION="$SMP_VERSION"
   if [ $? -ne 0 ]; then
     echo "Error occurred while building image [${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_WEBLOGIC122}:${SMP_VERSION}]!"
     exit 10
@@ -312,7 +270,7 @@ buildWebLogicOracleImages14(){
   fi
 
   # build SMP deployment.
-  docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_WEBLOGIC14}:${SMP_VERSION}" ./weblogic-14.1-smp/ --build-arg SMP_VERSION="$SMP_VERSION"
+  docker build -t "${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_WEBLOGIC14}:${SMP_VERSION}" ./${IMAGE_SMP_WEBLOGIC14}/ --build-arg SMP_VERSION="$SMP_VERSION"
   if [ $? -ne 0 ]; then
     echo "Error occurred while building image [${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_WEBLOGIC14}:${SMP_VERSION}]!"
     exit 10
@@ -352,8 +310,7 @@ cleanArtefacts() {
   rm "./oracle/OracleJava/java-8/${SERVER_JDK_FILE}"         # clean
   rm "./oracle/weblogic-12.2.1.4/${WEBLOGIC_122_QUICK_FILE}" # clean
 
-  rm -rf "./weblogic-12.2-smp/artefacts/*.*"
-  rm -rf "./tomcat-mysql-smp-sml/artefacts/*.*"
+  rm -rf "./${IMAGE_SMP_WEBLOGIC122}/artefacts/*.*"
 
   if [[ "V$SMP_ARTEFACTS_CLEAR" == "Vtrue" ]]; then
     rm -rf "${SMP_ARTEFACTS}/smp-setup.zip"
diff --git a/smp-docker/images/smp-springboot-mysql/Dockerfile b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/Dockerfile
similarity index 98%
rename from smp-docker/images/smp-springboot-mysql/Dockerfile
rename to domismp-tests/domismp-docker/images/domismp-springboot-mysql/Dockerfile
index c63f63aece61a6581faeec08e442e75d1097f575..ddb4ac1dbf038163f9dcadbe91226095524eaacb 100755
--- a/smp-docker/images/smp-springboot-mysql/Dockerfile
+++ b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/Dockerfile
@@ -5,6 +5,7 @@ ARG SMP_VERSION
 
 # Set the SMP_VERSION env variable  \
 ENV SMP_HOME=/opt/smp  \
+    SMP_VERSION=${SMP_VERSION}  \
     SMP_DB_SCHEMA=smp  \
     SMP_DB_USER=smp \
     SMP_INIT_PROPERTY_DELIMITER="||"  \
diff --git a/smp-docker/images/smp-springboot-mysql/README.md b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/README.md
similarity index 100%
rename from smp-docker/images/smp-springboot-mysql/README.md
rename to domismp-tests/domismp-docker/images/domismp-springboot-mysql/README.md
diff --git a/domismp-tests/domismp-docker/images/domismp-springboot-mysql/build.sh b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ef97896e20eae0a50b05bf22d479cd6d89d2c1ef
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/build.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# This is build script for building image.
+# first it copies external resources to resources folder
+# then it builds the image using docker-compose.build.yml
+# and finally it cleans the external resources
+: "${SMP_PROJECT_FOLDER:?Need to set SMP project folder non-empty!}"
+: "${SMP_VERSION:?Need to set SMP version non-empty!}"
+: "${SMP_ARTEFACTS:?Need to set SMP_ARTEFACTS non-empty!}"
+: "${SMP_SPRINGBOOT_ARTEFACTS:?Need to set SMP_SPRINGBOOT_ARTEFACTS non-empty!}"
+
+WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "${WORKING_DIR}"
+
+copyExternalImageResources() {
+		echo "Copy test project resources ..."
+     # copy artefact to docker build folder
+     cleanExternalImageResources
+     mkdir -p ./artefacts
+     # copy artefact to docker build folder
+     cp -r ../shared-artefacts ./artefacts/
+
+    if [[ ! -f "${SMP_SPRINGBOOT_ARTEFACTS}/smp-springboot-$SMP_VERSION-exec.jar" ]]; then
+      echo "SMP artefact '${SMP_SPRINGBOOT_ARTEFACTS}/smp-springboot-$SMP_VERSION-exec.jar' not found!"
+      exit 1
+    else
+      # for mysql tomcat
+      cp "${SMP_SPRINGBOOT_ARTEFACTS}/smp-springboot-$SMP_VERSION-exec.jar" ./artefacts/smp-springboot-exec.jar
+    fi
+
+    if [[ ! -f "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ]]; then
+      echo "SMP bundle artefact  '${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip' not found!"
+      exit 1
+    else
+      # for mysql data
+      cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ./artefacts/smp-setup.zip
+    fi
+}
+
+cleanExternalImageResources() {
+  echo "Clean external resources ..."
+  [[ -d  ./artefacts ]] && rm -rf ./artefacts/
+}
+
+composeBuildImage() {
+	echo "Build ${IMAGE_NAME_DOMIBUS_SOAPUI} image..."
+	docker compose -f docker-compose.build.yml build
+}
+
+
+# clean external resources before copy
+copyExternalImageResources
+composeBuildImage
+cleanExternalImageResources
diff --git a/domismp-tests/domismp-docker/images/domismp-springboot-mysql/docker-compose.build.yml b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/docker-compose.build.yml
new file mode 100644
index 0000000000000000000000000000000000000000..16cee3770c3b6c0d4dc4645b140720bfc9bc7383
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/docker-compose.build.yml
@@ -0,0 +1,13 @@
+#
+# Docker compose project used to build the domibus soapui docker image.
+#
+version: '3.2'
+services:
+  domismp-springboot-mysql:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_SPRINGBOOT_MYSQL}:${SMP_VERSION}
+    build:
+      context: .
+      args:
+        - SMP_VERSION
+
+
diff --git a/smp-docker/images/smp-springboot-mysql/entrypoint.sh b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh
similarity index 100%
rename from smp-docker/images/smp-springboot-mysql/entrypoint.sh
rename to domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh
diff --git a/domismp-tests/domismp-docker/images/domismp-tests/Dockerfile b/domismp-tests/domismp-docker/images/domismp-tests/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..1458cbb5365136328edafea849867779ead3fa3b
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-tests/Dockerfile
@@ -0,0 +1,104 @@
+# create builder to install maven which is needed
+FROM maven:3.9.6-eclipse-temurin-11
+
+ARG TEST_USER=edeltest
+ARG TEST_GROUP=${TEST_USER}
+ARG UID=1700
+ARG GID=1701
+# Build artefacts
+ARG FIREFOX_VERSION=120.0.1
+ARG FIREFOX_SHA512=40c4b8f06a2531855da42472089d81aaa0b6d33d6d6912540cd41ea5bd181e03942c3348c498ed6afc8087e40f0d7fb1f371d383dc7ca7154652c5622f9871ab
+ARG FIREFOX_DOWNLOAD_URL="https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/eu/firefox-$FIREFOX_VERSION.tar.bz2"
+ARG GECKODRIVER_VERSION=0.34.0
+ARG GECKODRIVER_SHA512=98c4ace1c22698c2babec55269a82c98888c1a5b35a2f15aa1f1f077f1d92f80c46deaddd584aaf649aa654c4a69f6a320e3f1ce40e6918dc71dd6102446c125
+ARG GECKODRIVER_DOWNLOAD_URL="https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz"
+
+#===================
+# Timezone settings set to UTC by default!
+#===================
+ENV TZ "UTC"
+
+
+#======================================
+# Configure environement
+#======================================
+ENV TEST_USER=${TEST_USER} \
+    TEST_WEBDRIVER_PATH=/usr/bin/geckodriver \
+    TEST_WEBDRIVER_TYPE=firefox \
+    TEST_WEBDRIVER_HEADLESS=true \
+    DATA=/data \
+    TEST_URL=http://localhost:8080/smp/
+
+ENV TEST_UI=${DATA}/test-ui \
+    TEST_API=${DATA}/test-api \
+    RESULT_FOLDER=${DATA}/results \
+    TEST_PLAN=ui
+
+USER root
+# create test user, folders and configure timezone
+RUN groupadd ${TEST_GROUP} \
+         --gid ${GID} \
+  && useradd ${TEST_USER} \
+         --create-home \
+         --gid ${GID} \
+         --shell /bin/bash \
+         --uid ${UID} \
+  && mkdir -p "${DATA}" \
+  && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \
+  && dpkg-reconfigure -f noninteractive tzdata \
+  && cat /etc/timezone
+
+
+# install firefox dependencies libgtk-3-0 libasound2 x11-common libx11-xcb1
+# install oher usefull tools bzip2 ca-certificates tzdata unzip wget
+RUN apt-get update -qqy \
+  && apt-get -qqy --no-install-recommends install  \
+    libgtk-3-0 \
+    libasound2 \
+    x11-common \
+    libx11-xcb1 \
+    bzip2 \
+    ca-certificates \
+    tzdata \
+    unzip \
+    wget \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
+  && echo "Download firefox version: $FIREFOX_DOWNLOAD_URL"  \
+  && wget --no-verbose -O /tmp/firefox.tar.bz2 $FIREFOX_DOWNLOAD_URL \
+  && echo $(sha512sum /tmp/firefox.tar.bz2) \
+  && sha512sum /tmp/firefox.tar.bz2 | grep $FIREFOX_SHA512 \
+  && wget --no-verbose -O /tmp/geckodriver.tar.gz $GECKODRIVER_DOWNLOAD_URL \
+  && sha512sum /tmp/geckodriver.tar.gz | grep $GECKODRIVER_SHA512 \
+  # install firefox
+  && echo "Install firefox version: $FIREFOX_VERSION" \
+  && tar -C /opt -xjf /tmp/firefox.tar.bz2 \
+  && rm /tmp/firefox.tar.bz2 \
+  && mv /opt/firefox /opt/firefox-$FIREFOX_VERSION \
+  && rm -rf  /usr/bin/firefox \
+  && ln -fs /opt/firefox-$FIREFOX_VERSION/firefox /usr/bin/firefox \
+  # install geckodriver
+  && echo "Install GeckoDriver version: $GECKODRIVER_VERSION" \
+  && tar -C /opt -zxf /tmp/geckodriver.tar.gz \
+  && rm /tmp/geckodriver.tar.gz \
+  && mv /opt/geckodriver /opt/geckodriver-$GECKODRIVER_VERSION \
+  && chmod 755 /opt/geckodriver-$GECKODRIVER_VERSION \
+  && ln -fs /opt/geckodriver-$GECKODRIVER_VERSION ${TEST_WEBDRIVER_PATH}
+
+
+COPY ./artefacts/test-ui ${TEST_UI}
+COPY ./artefacts/test-api ${TEST_API}
+COPY ./entrypoint.sh /sbin/entrypoint.sh
+
+RUN chmod 755 /sbin/entrypoint.sh \
+    && mkdir -p /${DATA}/results \
+    && chown -R ${TEST_USER}:${TEST_USER} /data
+
+USER ${TEST_USER}
+# dry run mvn and download all dependencies
+RUN cd ${TEST_UI}  \
+    && mvn clean verify -DskipITs -DskipTests \
+    && cd ${TEST_API}  \
+    && mvn dependency:resolve -P run-soapui -DskipITs -DskipTests \
+    && mvn clean verify -DskipITs -DskipTests
+
+ENTRYPOINT ["/sbin/entrypoint.sh"]
diff --git a/domismp-tests/domismp-docker/images/domismp-tests/build.sh b/domismp-tests/domismp-docker/images/domismp-tests/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7ccba0ec77027309f580574bc25a818c89e762ad
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-tests/build.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# This is build script for building image.
+# first it copies external resources to resources folder
+# then it builds the image using docker-compose.build.yml
+# and finally it cleans the external resources
+: "${SMP_PROJECT_FOLDER:?Need to set SMP project folder non-empty!}"
+: "${SMP_VERSION:?Need to set SMP version non-empty!}"
+
+WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "${WORKING_DIR}"
+
+copyExternalImageResources() {
+		echo "Copy test project resources ..."
+     # copy artefact to docker build folder
+     cleanExternalImageResources
+     mkdir -p ./artefacts
+     # copy artefact to docker build folder
+     cp -r "${SMP_PROJECT_FOLDER}/domismp-tests/domismp-tests-ui" ./artefacts/test-ui
+     cp -r "${SMP_PROJECT_FOLDER}/domismp-tests/domismp-tests-api" ./artefacts/test-api
+}
+
+cleanExternalImageResources() {
+    echo "Clean external resources ..."
+    [[ -d  ./artefacts/test-ui ]] && rm -rf ./artefacts/test-ui
+    [[ -d  ./artefacts/test-api ]] && rm -rf ./artefacts/test-api
+}
+
+composeBuildImage() {
+	echo "Build ${IMAGE_NAME_DOMIBUS_SOAPUI} image..."
+	docker compose -f docker-compose.build.yml build
+}
+
+
+# clean external resources before copy
+copyExternalImageResources
+composeBuildImage
+cleanExternalImageResources
diff --git a/domismp-tests/domismp-docker/images/domismp-tests/docker-compose.build.yml b/domismp-tests/domismp-docker/images/domismp-tests/docker-compose.build.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5a3b3874ed876f60de8d02494b882ffecc79dab1
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-tests/docker-compose.build.yml
@@ -0,0 +1,12 @@
+#
+# Docker compose project used to build the domibus soapui docker image.
+#
+version: '3.2'
+services:
+  domismp-tests:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TESTS}:${SMP_VERSION}
+    build:
+      context: .
+      args:
+        - SMP_VERSION
+
diff --git a/domismp-tests/domismp-docker/images/domismp-tests/entrypoint.sh b/domismp-tests/domismp-docker/images/domismp-tests/entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..42bacb3e1383d14a96579dd93abcc8f3f4457e82
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-tests/entrypoint.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+executeUITests(){
+  echo "[INFO] start execution of the tests from  ${TEST_UI}"
+  cd  "${TEST_UI}"
+  mvn clean verify
+  EXIT_CODE=$?
+  echo '[INFO] finished execution of the tests'
+  cp -R ${TEST_UI}/target/surefire-reports "${RESULT_FOLDER}"/
+  cp -R ${TEST_UI}/target/domismp-test.log "${RESULT_FOLDER}"/
+  exit ${EXIT_CODE}
+}
+
+executeAPITests() {
+  echo "[INFO] start execution of the tests from ${TEST_API}"
+     cd  "${TEST_API}"
+     mvn clean verify -Durl=${TEST_URL} -Prun-soapui
+     EXIT_CODE=$?
+     echo '[INFO] finished execution of the tests'
+     cp -R ${TEST_API}/target/soapui-reports "${RESULT_FOLDER}"/
+     exit ${EXIT_CODE}
+}
+
+createUIProperties(){
+  echo '[INFO] start execution of the soapui tests'
+}
+
+if [ "$TEST_PLAN" == "ui" ]; then
+  executeUITests
+elif [ "$TEST_PLAN" == "api" ]; then
+  executeAPITests
+elif [ "$TEST_PLAN" == "manual" ]; then
+  echo "[INFO] Container will start in idle mode to allow user to manually login and execute tests!"
+  tail -f /dev/null
+else
+  echo "[ERROR] Unknown test plan [$TEST_PLAN]! Allowed values are [ui, api, manual]!"
+  echo "[ERROR] Start container with -e TEST_PLAN=ui|api|manual to execute tests!"
+  exit 1
+fi
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/Dockerfile
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/Dockerfile
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/Dockerfile
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/README.md b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/README.md
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/README.md
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/README.md
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/bind/db.192 b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/db.192
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/bind/db.192
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/db.192
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/bind/db.test.edelivery.local b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/db.test.edelivery.local
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/bind/db.test.edelivery.local
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/db.test.edelivery.local
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/bind/named.conf b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/named.conf
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/bind/named.conf
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/named.conf
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/bind/named.conf.local b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/named.conf.local
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/bind/named.conf.local
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/named.conf.local
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/bind/named.conf.options b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/named.conf.options
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/bind/named.conf.options
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/bind/named.conf.options
diff --git a/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/build.sh b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..57aaae68e0339839ef3e528fa21c3944eb98c450
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/build.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+# This is build script for building image.
+# first it copies external resources to resources folder
+# then it builds the image using docker-compose.build.yml
+# and finally it cleans the external resources
+: "${SMP_PROJECT_FOLDER:?Need to set SMP project folder non-empty!}"
+: "${SMP_VERSION:?Need to set SMP version non-empty!}"
+: "${SMP_ARTEFACTS:?Need to set SMP_ARTEFACTS non-empty!}"
+
+WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "${WORKING_DIR}"
+
+copyExternalImageResources() {
+		echo "Copy test project resources ..."
+     # copy artefact to docker build folder
+     cleanExternalImageResources
+     mkdir -p ./artefacts
+     # copy artefact to docker build folder
+     cp -r ../shared-artefacts ./artefacts/
+
+    if [[ ! -d "${SMP_PLUGIN_EXAMPLE}" ]]; then
+      echo "SMP SPI plugin '${SMP_PLUGIN_EXAMPLE}' not found. copy from artefacts ${SMP_ARTEFACTS}!"
+      ls -ltr ${SMP_ARTEFACTS}
+      cp "${SMP_ARTEFACTS}/smp-spi-payload-validation-example-$SMP_VERSION.jar" ./artefacts/smp-spi-payload-validation-example.jar
+    else
+      cp "${SMP_PLUGIN_EXAMPLE}/smp-spi-payload-validation-example-$SMP_VERSION.jar" ./artefacts/smp-spi-payload-validation-example.jar
+    fi
+
+    if [[ ! -f "${SMP_ARTEFACTS}/smp.war" ]]; then
+      echo "SMP artefact '${SMP_ARTEFACTS}/smp.war' not found. Was project built?"
+      exit 1
+    else
+      # for mysql tomcat
+      cp "${SMP_ARTEFACTS}/smp.war" ./artefacts/smp.war
+    fi
+
+
+    if [[ ! -f "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ]]; then
+      echo "SMP bundle artefact  '${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip' not found!"
+      exit 1
+    else
+      # for mysql data
+      cp "${SMP_ARTEFACTS}/smp-${SMP_VERSION}-setup.zip" ./artefacts/smp-setup.zip
+    fi
+}
+
+cleanExternalImageResources() {
+  echo "Clean external resources ..."
+  [[ -d  ./artefacts ]] && rm -rf ./artefacts/
+}
+
+composeBuildImage() {
+	echo "Build ${IMAGE_NAME_DOMIBUS_SOAPUI} image..."
+	docker compose -f docker-compose.build.yml build
+}
+
+
+# clean external resources before copy
+copyExternalImageResources
+composeBuildImage
+cleanExternalImageResources
diff --git a/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/docker-compose.build.yml b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/docker-compose.build.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4f38207506cf2f5a9c0aa52849a869de47d1d183
--- /dev/null
+++ b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/docker-compose.build.yml
@@ -0,0 +1,13 @@
+#
+# Docker compose project used to build the domibus soapui docker image.
+#
+version: '3.2'
+services:
+  domismp-springboot-mysql:
+    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TOMCAT_MYSQL}:${SMP_VERSION}
+    build:
+      context: .
+      args:
+        - SMP_VERSION
+
+
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/entrypoint.sh b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh
similarity index 100%
rename from smp-docker/images/tomcat-mysql-smp-sml/entrypoint.sh
rename to domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/Dockerfile b/domismp-tests/domismp-docker/images/domismp-weblogic122/Dockerfile
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/Dockerfile
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/Dockerfile
diff --git a/smp-docker/images/weblogic-12.2-smp/README.md b/domismp-tests/domismp-docker/images/domismp-weblogic122/README.md
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/README.md
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/README.md
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/create-wls-domain.py b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/create-wls-domain.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/create-wls-domain.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/create-wls-domain.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/createWLSDomain.sh b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/createWLSDomain.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/createWLSDomain.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/createWLSDomain.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/datasource.properties.oracle b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/datasource.properties.oracle
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/datasource.properties.oracle
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/datasource.properties.oracle
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/deploySMPToDomain.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/deploySMPToDomain.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/ds-deploy.py b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/ds-deploy.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/ds-deploy.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/ds-deploy.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/enable-server-https.py b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/enable-server-https.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/enable-server-https.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/enable-server-https.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/functions/keystore.functions b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/functions/keystore.functions
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/functions/keystore.functions
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/functions/keystore.functions
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/shutdown-servers.py b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/shutdown-servers.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/shutdown-servers.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/shutdown-servers.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/smp-app-deploy.py b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/smp-app-deploy.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/smp-app-deploy.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/smp-app-deploy.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/wlst b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/wlst
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/wlst
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/init-scripts/wlst
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/startAdminServer.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/startAdminServer.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/startManagedServer.sh b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/startManagedServer.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/startManagedServer.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/startManagedServer.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/waitForAdminServer.sh b/domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/waitForAdminServer.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/waitForAdminServer.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/container-scripts/waitForAdminServer.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/properties/init/datasource.properties b/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/datasource.properties
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/properties/init/datasource.properties
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/datasource.properties
diff --git a/smp-docker/images/weblogic-12.2-smp/properties/init/domain.properties b/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/domain.properties
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/properties/init/domain.properties
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/domain.properties
diff --git a/smp-docker/images/weblogic-12.2-smp/properties/init/smp.config.properties b/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/properties/init/smp.config.properties
rename to domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties
diff --git a/smp-docker/images/weblogic-14.1-smp/Dockerfile b/domismp-tests/domismp-docker/images/domismp-weblogic141/Dockerfile
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/Dockerfile
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/Dockerfile
diff --git a/smp-docker/images/weblogic-14.1-smp/README.md b/domismp-tests/domismp-docker/images/domismp-weblogic141/README.md
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/README.md
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/README.md
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/create-wls-domain.py b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/create-wls-domain.py
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/create-wls-domain.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/create-wls-domain.py
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/createWLSDomain.sh b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/createWLSDomain.sh
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/createWLSDomain.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/createWLSDomain.sh
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/datasource.properties.oracle b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/datasource.properties.oracle
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/datasource.properties.oracle
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/datasource.properties.oracle
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/deploySMPToDomain.sh b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/deploySMPToDomain.sh
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/deploySMPToDomain.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/deploySMPToDomain.sh
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/ds-deploy.py b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/ds-deploy.py
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/ds-deploy.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/ds-deploy.py
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/enable-server-https.py b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/enable-server-https.py
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/enable-server-https.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/enable-server-https.py
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/functions/keystore.functions b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/functions/keystore.functions
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/functions/keystore.functions
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/functions/keystore.functions
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/shutdown-servers.py b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/shutdown-servers.py
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/shutdown-servers.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/shutdown-servers.py
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/smp-app-deploy.py b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/smp-app-deploy.py
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/smp-app-deploy.py
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/smp-app-deploy.py
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/wlst b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/wlst
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/wlst
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/init-scripts/wlst
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/startAdminServer.sh b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/startAdminServer.sh
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/startAdminServer.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/startAdminServer.sh
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/startManagedServer.sh b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/startManagedServer.sh
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/startManagedServer.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/startManagedServer.sh
diff --git a/smp-docker/images/weblogic-14.1-smp/container-scripts/waitForAdminServer.sh b/domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/waitForAdminServer.sh
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/container-scripts/waitForAdminServer.sh
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/container-scripts/waitForAdminServer.sh
diff --git a/smp-docker/images/weblogic-14.1-smp/properties/init/datasource.properties b/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/datasource.properties
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/properties/init/datasource.properties
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/datasource.properties
diff --git a/smp-docker/images/weblogic-14.1-smp/properties/init/domain.properties b/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/domain.properties
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/properties/init/domain.properties
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/domain.properties
diff --git a/smp-docker/images/weblogic-14.1-smp/properties/init/smp.config.properties b/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties
similarity index 100%
rename from smp-docker/images/weblogic-14.1-smp/properties/init/smp.config.properties
rename to domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties
diff --git a/smp-docker/images/oracle/OracleJava/README.md b/domismp-tests/domismp-docker/images/oracle/OracleJava/README.md
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/README.md
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/README.md
diff --git a/smp-docker/images/oracle/OracleJava/java-11/Dockerfile b/domismp-tests/domismp-docker/images/oracle/OracleJava/java-11/Dockerfile
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/java-11/Dockerfile
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/java-11/Dockerfile
diff --git a/smp-docker/images/oracle/OracleJava/java-11/Dockerfile.8 b/domismp-tests/domismp-docker/images/oracle/OracleJava/java-11/Dockerfile.8
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/java-11/Dockerfile.8
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/java-11/Dockerfile.8
diff --git a/smp-docker/images/oracle/OracleJava/java-11/build.sh b/domismp-tests/domismp-docker/images/oracle/OracleJava/java-11/build.sh
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/java-11/build.sh
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/java-11/build.sh
diff --git a/smp-docker/images/oracle/OracleJava/java-8/Dockerfile b/domismp-tests/domismp-docker/images/oracle/OracleJava/java-8/Dockerfile
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/java-8/Dockerfile
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/java-8/Dockerfile
diff --git a/smp-docker/images/oracle/OracleJava/java-8/Dockerfile.8 b/domismp-tests/domismp-docker/images/oracle/OracleJava/java-8/Dockerfile.8
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/java-8/Dockerfile.8
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/java-8/Dockerfile.8
diff --git a/smp-docker/images/oracle/OracleJava/java-8/build.sh b/domismp-tests/domismp-docker/images/oracle/OracleJava/java-8/build.sh
similarity index 100%
rename from smp-docker/images/oracle/OracleJava/java-8/build.sh
rename to domismp-tests/domismp-docker/images/oracle/OracleJava/java-8/build.sh
diff --git a/smp-docker/images/oracle/README.md b/domismp-tests/domismp-docker/images/oracle/README.md
similarity index 100%
rename from smp-docker/images/oracle/README.md
rename to domismp-tests/domismp-docker/images/oracle/README.md
diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/Checksum.xe b/domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/Checksum.xe
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-11.2.0.2/Checksum.xe
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/Checksum.xe
diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/Dockerfile.xe b/domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/Dockerfile.xe
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-11.2.0.2/Dockerfile.xe
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/Dockerfile.xe
diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/checkDBStatus.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/checkDBStatus.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-11.2.0.2/checkDBStatus.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/checkDBStatus.sh
diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh
diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/setPassword.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/setPassword.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-11.2.0.2/setPassword.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/setPassword.sh
diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/xe.rsp b/domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/xe.rsp
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-11.2.0.2/xe.rsp
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-11.2.0.2/xe.rsp
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/Checksum.ee b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/Checksum.ee
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/Checksum.ee
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/Checksum.ee
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/Checksum.se2 b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/Checksum.se2
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/Checksum.se2
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/Checksum.se2
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/Dockerfile b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/Dockerfile
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/Dockerfile
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/Dockerfile
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/checkDBStatus.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/checkDBStatus.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/checkDBStatus.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/checkDBStatus.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/checkSpace.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/checkSpace.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/checkSpace.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/checkSpace.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/createDB.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/createDB.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/createDB.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/createDB.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/db_inst.rsp b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/db_inst.rsp
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/db_inst.rsp
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/db_inst.rsp
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/dbca.rsp.tmpl b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/dbca.rsp.tmpl
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/dbca.rsp.tmpl
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/dbca.rsp.tmpl
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/installDBBinaries.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/installDBBinaries.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/installDBBinaries.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/installDBBinaries.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/relinkOracleBinary.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/relinkOracleBinary.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/relinkOracleBinary.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/relinkOracleBinary.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/runUserScripts.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/runUserScripts.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/runUserScripts.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/runUserScripts.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/setPassword.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/setPassword.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/setPassword.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/setPassword.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/setupLinuxEnv.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/setupLinuxEnv.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/setupLinuxEnv.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/setupLinuxEnv.sh
diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/startDB.sh b/domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/startDB.sh
similarity index 100%
rename from smp-docker/images/oracle/oracle-db-19.3.0/startDB.sh
rename to domismp-tests/domismp-docker/images/oracle/oracle-db-19.3.0/startDB.sh
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/Checksum.developer b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Checksum.developer
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/Checksum.developer
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Checksum.developer
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/Checksum.generic b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Checksum.generic
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/Checksum.generic
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Checksum.generic
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/Checksum.slim b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Checksum.slim
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/Checksum.slim
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Checksum.slim
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.developer b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.developer
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.developer
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.developer
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.generic b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.generic
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.generic
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.generic
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.slim b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.slim
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.slim
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/Dockerfile.slim
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/README.md b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/README.md
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/README.md
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/README.md
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/create-wls-domain.py b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/create-wls-domain.py
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/create-wls-domain.py
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/create-wls-domain.py
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/createAndStartEmptyDomain.sh b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/createAndStartEmptyDomain.sh
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/createAndStartEmptyDomain.sh
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/createAndStartEmptyDomain.sh
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/get_healthcheck_url.sh b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/get_healthcheck_url.sh
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/get_healthcheck_url.sh
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/container-scripts/get_healthcheck_url.sh
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_lite_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_lite_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_lite_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_lite_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_slim_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_slim_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_slim_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/fmw_12.2.1.4.0_wls_quick_slim_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/install.file b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/install.file
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/install.file
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/install.file
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/oraInst.loc b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/oraInst.loc
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/oraInst.loc
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/oraInst.loc
diff --git a/smp-docker/images/oracle/weblogic-12.2.1.4/properties/domain.properties b/domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/properties/domain.properties
similarity index 100%
rename from smp-docker/images/oracle/weblogic-12.2.1.4/properties/domain.properties
rename to domismp-tests/domismp-docker/images/oracle/weblogic-12.2.1.4/properties/domain.properties
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Checksum.developer b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Checksum.developer
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Checksum.developer
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Checksum.developer
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Checksum.generic b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Checksum.generic
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Checksum.generic
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Checksum.generic
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Checksum.slim b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Checksum.slim
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Checksum.slim
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Checksum.slim
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-11 b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-11
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-11
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-11
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-8 b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-8
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-8
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.developer-8
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-11 b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-11
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-11
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-11
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-8 b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-8
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-8
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.generic-8
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-11 b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-11
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-11
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-11
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-8 b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-8
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-8
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/Dockerfile.slim-8
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/README.md b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/README.md
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/README.md
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/README.md
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/create-wls-domain.py b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/create-wls-domain.py
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/create-wls-domain.py
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/create-wls-domain.py
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/createAndStartEmptyDomain.sh b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/createAndStartEmptyDomain.sh
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/createAndStartEmptyDomain.sh
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/createAndStartEmptyDomain.sh
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/get_healthcheck_url.sh b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/get_healthcheck_url.sh
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/get_healthcheck_url.sh
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/container-scripts/get_healthcheck_url.sh
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_quick_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_quick_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_quick_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_quick_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_slim_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_slim_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_slim_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_lite_slim_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_slim_Disk1_1of1.zip.download b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_slim_Disk1_1of1.zip.download
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_slim_Disk1_1of1.zip.download
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/fmw_14.1.1.0.0_wls_quick_slim_Disk1_1of1.zip.download
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/install.file b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/install.file
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/install.file
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/install.file
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/oraInst.loc b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/oraInst.loc
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/oraInst.loc
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/oraInst.loc
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/properties/domain.properties b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/properties/domain.properties
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/properties/domain.properties
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/properties/domain.properties
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/data/config/smp.config.properties b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/data/config/smp.config.properties
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/data/config/smp.config.properties
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/data/config/smp.config.properties
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/01_create_user.sql b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/01_create_user.sql
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/01_create_user.sql
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/01_create_user.sql
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/02_oracle10g.sql b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/02_oracle10g.sql
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/02_oracle10g.sql
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/02_oracle10g.sql
diff --git a/smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/03_oracle10g-data.sql b/domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/03_oracle10g-data.sql
similarity index 100%
rename from smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/03_oracle10g-data.sql
rename to domismp-tests/domismp-docker/images/oracle/weblogic-14.1.1.0/run/properties/db-scripts/03_oracle10g-data.sql
diff --git a/smp-docker/images/shared-artefacts/README.md b/domismp-tests/domismp-docker/images/shared-artefacts/README.md
similarity index 100%
rename from smp-docker/images/shared-artefacts/README.md
rename to domismp-tests/domismp-docker/images/shared-artefacts/README.md
diff --git a/smp-docker/images/shared-artefacts/sml-mysql5innodb-data.sql b/domismp-tests/domismp-docker/images/shared-artefacts/sml-mysql5innodb-data.sql
similarity index 100%
rename from smp-docker/images/shared-artefacts/sml-mysql5innodb-data.sql
rename to domismp-tests/domismp-docker/images/shared-artefacts/sml-mysql5innodb-data.sql
diff --git a/smp-docker/images/shared-artefacts/sml-truststore-docker-demo.p12 b/domismp-tests/domismp-docker/images/shared-artefacts/sml-truststore-docker-demo.p12
similarity index 100%
rename from smp-docker/images/shared-artefacts/sml-truststore-docker-demo.p12
rename to domismp-tests/domismp-docker/images/shared-artefacts/sml-truststore-docker-demo.p12
diff --git a/smp-docker/images/shared-artefacts/smp-keystore-docker-demo.p12 b/domismp-tests/domismp-docker/images/shared-artefacts/smp-keystore-docker-demo.p12
similarity index 100%
rename from smp-docker/images/shared-artefacts/smp-keystore-docker-demo.p12
rename to domismp-tests/domismp-docker/images/shared-artefacts/smp-keystore-docker-demo.p12
diff --git a/smp-docker/images/shared-artefacts/smp-logback.xml b/domismp-tests/domismp-docker/images/shared-artefacts/smp-logback.xml
similarity index 100%
rename from smp-docker/images/shared-artefacts/smp-logback.xml
rename to domismp-tests/domismp-docker/images/shared-artefacts/smp-logback.xml
diff --git a/smp-docker/images/smp-httpd/Dockerfile b/domismp-tests/domismp-docker/images/smp-httpd/Dockerfile
similarity index 100%
rename from smp-docker/images/smp-httpd/Dockerfile
rename to domismp-tests/domismp-docker/images/smp-httpd/Dockerfile
diff --git a/smp-docker/images/smp-httpd/README.md b/domismp-tests/domismp-docker/images/smp-httpd/README.md
similarity index 100%
rename from smp-docker/images/smp-httpd/README.md
rename to domismp-tests/domismp-docker/images/smp-httpd/README.md
diff --git a/smp-docker/images/smp-httpd/resources/entrypoint.sh b/domismp-tests/domismp-docker/images/smp-httpd/resources/entrypoint.sh
similarity index 100%
rename from smp-docker/images/smp-httpd/resources/entrypoint.sh
rename to domismp-tests/domismp-docker/images/smp-httpd/resources/entrypoint.sh
diff --git a/smp-docker/images/smp-httpd/resources/httpd-default.conf b/domismp-tests/domismp-docker/images/smp-httpd/resources/httpd-default.conf
similarity index 100%
rename from smp-docker/images/smp-httpd/resources/httpd-default.conf
rename to domismp-tests/domismp-docker/images/smp-httpd/resources/httpd-default.conf
diff --git a/smp-docker/images/smp-httpd/resources/httpd.conf b/domismp-tests/domismp-docker/images/smp-httpd/resources/httpd.conf
similarity index 100%
rename from smp-docker/images/smp-httpd/resources/httpd.conf
rename to domismp-tests/domismp-docker/images/smp-httpd/resources/httpd.conf
diff --git a/smp-docker/images/smp-httpd/resources/vhost_corner.conf b/domismp-tests/domismp-docker/images/smp-httpd/resources/vhost_corner.conf
similarity index 100%
rename from smp-docker/images/smp-httpd/resources/vhost_corner.conf
rename to domismp-tests/domismp-docker/images/smp-httpd/resources/vhost_corner.conf
diff --git a/smp-docker/pom.xml b/domismp-tests/domismp-docker/pom.xml
similarity index 88%
rename from smp-docker/pom.xml
rename to domismp-tests/domismp-docker/pom.xml
index 1bfbf0720914b0aa2a0f4ff5a72b65106ee70a43..23362ab001b2db124f283446449f53f9cd830e47 100644
--- a/smp-docker/pom.xml
+++ b/domismp-tests/domismp-docker/pom.xml
@@ -9,16 +9,18 @@
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
         <version>5.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>
         <!-- Only selected modules are deployed -->
         <maven.deploy.skip>false</maven.deploy.skip>
+        <!-- Docker images artefacts are located in this folder -->
         <docker.artefacts.folder>/CEF/repo</docker.artefacts.folder>
     </properties>
-    <artifactId>smp-docker</artifactId>
+    <artifactId>domismp-docker</artifactId>
     <packaging>jar</packaging>
-    <name>SMP Docker</name>
+    <name>domismp-docker</name>
+    <description>DomiSMP integration tests docker</description>
     <profiles>
         <profile>
             <id>build-docker-images</id>
@@ -48,5 +50,4 @@
             </build>
         </profile>
     </profiles>
-
 </project>
diff --git a/smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql b/domismp-tests/domismp-tests-api/groovy/mysql-4.1_integration_test_data.sql
similarity index 100%
rename from smp-soapui-tests/groovy/mysql-4.1_integration_test_data.sql
rename to domismp-tests/domismp-tests-api/groovy/mysql-4.1_integration_test_data.sql
diff --git a/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql b/domismp-tests/domismp-tests-api/groovy/oracle-4.1_integration_test_data.sql
similarity index 100%
rename from smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql
rename to domismp-tests/domismp-tests-api/groovy/oracle-4.1_integration_test_data.sql
diff --git a/smp-soapui-tests/pom.xml b/domismp-tests/domismp-tests-api/pom.xml
similarity index 71%
rename from smp-soapui-tests/pom.xml
rename to domismp-tests/domismp-tests-api/pom.xml
index 82496c92bac058e8991fb38a34bd0bb088b4be3e..72a1b9248bc6a62f72d605fa53b7ba1451ccc456 100644
--- a/smp-soapui-tests/pom.xml
+++ b/domismp-tests/domismp-tests-api/pom.xml
@@ -1,29 +1,27 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>eu.europa.ec.edelivery</groupId>
-        <artifactId>smp-modules</artifactId>
-        <version>5.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>smp-soapui-tests</artifactId>
-    <packaging>jar</packaging>
-    <name>smp-soapui-tests</name>
-    <description>Interaction tests suit for SMP</description>
+    <groupId>eu.europa.ec.edelivery</groupId>
+    <artifactId>domismp-tests-api</artifactId>
+    <version>5.1-SNAPSHOT</version>
+    <name>domismp-tests-api</name>
+    <description>Integration tests suit for DomiSMP API (WebService) testing using SOAPUI framework</description>
 
     <properties>
         <!-- Only selected modules are deployed -->
         <maven.deploy.skip>false</maven.deploy.skip>
         <url>http://localhost:8080/smp</url>
-        <SMPAdminUser />
-        <SMPAdminPassword />
+        <SMPAdminUser/>
+        <SMPAdminPassword/>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- the soap ui specific dependencies -->
-        <com.smartbear.soapui.version>5.1.2</com.smartbear.soapui.version>
+        <plugin.soapui-maven-plugin.version>5.7.2</plugin.soapui-maven-plugin.version>
+
         <org.codehaus.groovy.version>2.9.2-01</org.codehaus.groovy.version>
         <org.codehaus.groovy.eclipse-batch.version>2.5.13-01</org.codehaus.groovy.eclipse-batch.version>
 
+        <com.jgoodies.version>1.0.7</com.jgoodies.version>
         <http-builder.version>0.7.1</http-builder.version>
         <reflection.version>0.9.11</reflection.version>
         <httpcore.version>4.4.3</httpcore.version>
@@ -33,36 +31,44 @@
         <pluginRepository>
             <id>SmartBearPluginRepository</id>
             <url>https://www.soapui.org/repository/maven2/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>eviwarePluginRepository</id>
-            <url>https://www.eviware.com/repository/maven2/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
         </pluginRepository>
     </pluginRepositories>
 
     <repositories>
         <repository>
-            <id>SmartBearPluginRepository</id>
-            <url>https://www.soapui.org/repository/maven2/</url>
+            <id>SmartBearDependencyRepository</id>
+            <url>https://www.soapui.org/repository/maven2</url>
             <releases>
-                <enabled>false</enabled>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
             </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </repository>
+
     </repositories>
     <dependencies>
         <!-- for development purposes only. The soapui
-has its own groovy library -->
+        has its own groovy library -->
         <dependency>
             <groupId>com.smartbear.soapui</groupId>
             <artifactId>soapui</artifactId>
-            <version>${com.smartbear.soapui.version}</version>
-            <scope>provided</scope>
+            <version>${plugin.soapui-maven-plugin.version}</version>
         </dependency>
+
     </dependencies>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.smartbear.soapui</groupId>
+                    <artifactId>soapui-maven-plugin</artifactId>
+                    <version>${plugin.soapui-maven-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -101,8 +107,7 @@ has its own groovy library -->
                 <plugins>
                     <plugin>
                         <groupId>com.smartbear.soapui</groupId>
-                        <artifactId>soapui-pro-maven-plugin</artifactId>
-                        <version>${com.smartbear.soapui.version}</version>
+                        <artifactId>soapui-maven-plugin</artifactId>
                         <configuration>
                             <outputFolder>${project.build.directory}/soapui-reports/</outputFolder>
                             <junitReport>true</junitReport>
@@ -137,6 +142,18 @@ has its own groovy library -->
                             </projectProperties>
                         </configuration>
                         <dependencies>
+                            <!-- add build groovy test library as plugin dependency!
+This lib must be added because non-pro maven version can not take groovy scripts as path!-->
+                            <dependency>
+                                <groupId>eu.europa.ec.edelivery</groupId>
+                                <artifactId>domismp-tests-api</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.jgoodies</groupId>
+                                <artifactId>forms</artifactId>
+                                <version>${com.jgoodies.version}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>org.reflections</groupId>
                                 <artifactId>reflections</artifactId>
@@ -168,40 +185,6 @@ has its own groovy library -->
                         </executions>
                     </plugin>
 
-                    <!-- extract classes so that JACOCO plugin can find the classes
-                    to generate a report (use this option to get Code coverage report for SOAPUI project)
-                    -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>smp-server-library</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>jar</type>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>smp</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>war</type>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <includes>eu/europa/ec/edelivery/smp/**/*.class</includes>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/smp-soapui-tests/scripts/clean-install-smp.sh b/domismp-tests/domismp-tests-api/scripts/clean-install-smp.sh
similarity index 100%
rename from smp-soapui-tests/scripts/clean-install-smp.sh
rename to domismp-tests/domismp-tests-api/scripts/clean-install-smp.sh
diff --git a/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml b/domismp-tests/domismp-tests-api/soapui/SMP4.0-Generic-soapui-project.xml
similarity index 100%
rename from smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml
rename to domismp-tests/domismp-tests-api/soapui/SMP4.0-Generic-soapui-project.xml
diff --git a/smp-soapui-tests/soapui/SMP_2.0/DomiSMP-Oasis2-soapui-project.xml b/domismp-tests/domismp-tests-api/soapui/SMP_2.0/DomiSMP-Oasis2-soapui-project.xml
similarity index 100%
rename from smp-soapui-tests/soapui/SMP_2.0/DomiSMP-Oasis2-soapui-project.xml
rename to domismp-tests/domismp-tests-api/soapui/SMP_2.0/DomiSMP-Oasis2-soapui-project.xml
diff --git a/smp-soapui-tests/soapui/SMP_2.0/Project_Properties/testcase_properties.json b/domismp-tests/domismp-tests-api/soapui/SMP_2.0/Project_Properties/testcase_properties.json
similarity index 100%
rename from smp-soapui-tests/soapui/SMP_2.0/Project_Properties/testcase_properties.json
rename to domismp-tests/domismp-tests-api/soapui/SMP_2.0/Project_Properties/testcase_properties.json
diff --git a/smp-soapui-tests/soapui/test/DomiSMP-soapui-project.xml b/domismp-tests/domismp-tests-api/soapui/test/DomiSMP-soapui-project.xml
similarity index 100%
rename from smp-soapui-tests/soapui/test/DomiSMP-soapui-project.xml
rename to domismp-tests/domismp-tests-api/soapui/test/DomiSMP-soapui-project.xml
diff --git a/smp-soapui-tests/soapui/test/samples/oasis-smp-1.0/service_group_valid_template.xml b/domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-1.0/service_group_valid_template.xml
similarity index 100%
rename from smp-soapui-tests/soapui/test/samples/oasis-smp-1.0/service_group_valid_template.xml
rename to domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-1.0/service_group_valid_template.xml
diff --git a/smp-soapui-tests/soapui/test/samples/oasis-smp-1.0/service_metadata_valid_template.xml b/domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-1.0/service_metadata_valid_template.xml
similarity index 100%
rename from smp-soapui-tests/soapui/test/samples/oasis-smp-1.0/service_metadata_valid_template.xml
rename to domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-1.0/service_metadata_valid_template.xml
diff --git a/smp-soapui-tests/soapui/test/samples/oasis-smp-2.0/service_group_valid_template.xml b/domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-2.0/service_group_valid_template.xml
similarity index 100%
rename from smp-soapui-tests/soapui/test/samples/oasis-smp-2.0/service_group_valid_template.xml
rename to domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-2.0/service_group_valid_template.xml
diff --git a/smp-soapui-tests/soapui/test/samples/oasis-smp-2.0/service_metadata_valid_template.xml b/domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-2.0/service_metadata_valid_template.xml
similarity index 100%
rename from smp-soapui-tests/soapui/test/samples/oasis-smp-2.0/service_metadata_valid_template.xml
rename to domismp-tests/domismp-tests-api/soapui/test/samples/oasis-smp-2.0/service_metadata_valid_template.xml
diff --git a/smp-soapui-tests/soapui/test/test-case-properties/smp-1.0_001.properties b/domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-1.0_001.properties
similarity index 100%
rename from smp-soapui-tests/soapui/test/test-case-properties/smp-1.0_001.properties
rename to domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-1.0_001.properties
diff --git a/smp-soapui-tests/soapui/test/test-case-properties/smp-1.0_002.properties b/domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-1.0_002.properties
similarity index 100%
rename from smp-soapui-tests/soapui/test/test-case-properties/smp-1.0_002.properties
rename to domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-1.0_002.properties
diff --git a/smp-soapui-tests/soapui/test/test-case-properties/smp-2.0_001.properties b/domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-2.0_001.properties
similarity index 100%
rename from smp-soapui-tests/soapui/test/test-case-properties/smp-2.0_001.properties
rename to domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-2.0_001.properties
diff --git a/smp-soapui-tests/soapui/test/test-case-properties/smp-2.0_002.properties b/domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-2.0_002.properties
similarity index 100%
rename from smp-soapui-tests/soapui/test/test-case-properties/smp-2.0_002.properties
rename to domismp-tests/domismp-tests-api/soapui/test/test-case-properties/smp-2.0_002.properties
diff --git a/smp-soapui-tests/src/main/java/SMP.groovy b/domismp-tests/domismp-tests-api/src/main/java/SMP.groovy
similarity index 100%
rename from smp-soapui-tests/src/main/java/SMP.groovy
rename to domismp-tests/domismp-tests-api/src/main/java/SMP.groovy
diff --git a/domiSMP-ui-tests/pom.xml b/domismp-tests/domismp-tests-ui/pom.xml
similarity index 97%
rename from domiSMP-ui-tests/pom.xml
rename to domismp-tests/domismp-tests-ui/pom.xml
index 62d21f9f0ce95d9a01466b335bf3e1b61a25658d..77661a489f5fc116c3691c105ad61315f8ba4fe4 100644
--- a/domiSMP-ui-tests/pom.xml
+++ b/domismp-tests/domismp-tests-ui/pom.xml
@@ -5,8 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>eu.europa.ec.edelivery</groupId>
-    <artifactId>domiSMP-ui-tests</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>domismp-tests-ui</artifactId>
+    <version>5.1-SNAPSHOT</version>
+    <name>domismp-tests-ui</name>
+    <description>Integration tests suit for DomiSMP UI testing using selenium framework</description>
     <properties>
         <!-- configuration example-->
         <test.properties.path>./src/main/resources/myLocal.properties</test.properties.path>
@@ -71,7 +73,6 @@
                         <configuration>
                             <systemPropertyVariables>
                                 <propertiesFile>./src/main/resources/myLocal.properties</propertiesFile>
-
                             </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <suiteXmlFile>testng.xml</suiteXmlFile>
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/CommonCertificatePage.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/CommonCertificatePage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/CommonCertificatePage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/CommonCertificatePage.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithTabs.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/CommonPageWithTabs.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithTabs.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/CommonPageWithTabs.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithTabsAndGrid.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/CommonPageWithTabsAndGrid.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/CommonPageWithTabsAndGrid.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/CommonPageWithTabsAndGrid.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/DomiSMPPage.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/DomiSMPPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/DomiSMPPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/DomiSMPPage.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/AlertComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/AlertComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/AlertComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/AlertComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/BreadcrumpComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/BreadcrumpComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/BreadcrumpComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/BreadcrumpComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/ConfirmationDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/ConfirmationDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/ConfirmationDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/ConfirmationDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/DComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/DComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/DComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/DComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/Grid/BasicGrid.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/Grid/BasicGrid.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/Grid/BasicGrid.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/Grid/BasicGrid.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/Grid/GridPagination.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/Grid/GridPagination.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/Grid/GridPagination.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/Grid/GridPagination.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/Grid/SmallGrid.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/Grid/SmallGrid.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/Grid/SmallGrid.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/Grid/SmallGrid.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/SideNavigationComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SideNavigationComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/SideNavigationComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SideNavigationComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersPopup.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersPopup.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersPopup.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersPopup.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersWithGridPopup.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersWithGridPopup.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersWithGridPopup.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/members/InviteMembersWithGridPopup.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/members/MembersComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/members/MembersComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/members/MembersComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/members/MembersComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/subcategoryTab/SubcategoryTabComponent.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/subcategoryTab/SubcategoryTabComponent.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/subcategoryTab/SubcategoryTabComponent.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/commonComponents/subcategoryTab/SubcategoryTabComponent.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/mat/MatSelect.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/mat/MatSelect.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dcomponents/mat/MatSelect.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/mat/MatSelect.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dobjects/DButton.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DButton.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dobjects/DButton.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DButton.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dobjects/DInput.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DInput.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dobjects/DInput.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DInput.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dobjects/DLink.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DLink.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dobjects/DLink.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DLink.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dobjects/DObject.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DObject.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dobjects/DObject.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DObject.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dobjects/DSelect.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DSelect.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dobjects/DSelect.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DSelect.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dobjects/DWait.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DWait.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/dobjects/DWait.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/dobjects/DWait.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/enums/ApplicationRoles.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/ApplicationRoles.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/enums/ApplicationRoles.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/ApplicationRoles.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/enums/KeyStoreTypes.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/KeyStoreTypes.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/enums/KeyStoreTypes.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/KeyStoreTypes.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/enums/Pages.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/Pages.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/enums/Pages.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/Pages.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/enums/ResourceTypes.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/ResourceTypes.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/enums/ResourceTypes.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/ResourceTypes.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/enums/ResponseCertificates.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/ResponseCertificates.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/enums/ResponseCertificates.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/ResponseCertificates.java
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/enums/SMPThemes.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/SMPThemes.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/ddsl/enums/SMPThemes.java
rename to domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/SMPThemes.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/LoginPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/LoginPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/LoginPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/LoginPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/SmlPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/SmlPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/SmlPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/SmlPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/CreateGroupDetailsDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/CreateGroupDetailsDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/CreateGroupDetailsDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/CreateGroupDetailsDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/DomainMembersTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/DomainMembersTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/DomainMembersTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/DomainMembersTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/EditDomainsPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/EditDomainsPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/EditDomainsPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/EditDomainsPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/GroupTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/GroupTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editDomainsPage/GroupTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editDomainsPage/GroupTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/CreateResourceDetailsDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/CreateResourceDetailsDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/CreateResourceDetailsDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/CreateResourceDetailsDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/EditGroupsPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/EditGroupsPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/EditGroupsPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/EditGroupsPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/GroupMembersTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/GroupMembersTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/GroupMembersTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/GroupMembersTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/ResourceTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/ResourceTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editGroupsPage/ResourceTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editGroupsPage/ResourceTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/CreateSubresourceDetailsDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/CreateSubresourceDetailsDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/CreateSubresourceDetailsDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/CreateSubresourceDetailsDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/EditResourcePage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/EditResourcePage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/EditResourcePage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/EditResourcePage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/ResourceDetailsTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/ResourceDetailsTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/ResourceDetailsTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/ResourceDetailsTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/ResourcesMembersTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/ResourcesMembersTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/ResourcesMembersTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/ResourcesMembersTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/SubresourceTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/SubresourceTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/SubresourceTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/SubresourceTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentWizardDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentWizardDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentWizardDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/administration/editResourcesPage/editResourceDocumentPage/EditResourceDocumentWizardDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/TruststorePage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/TruststorePage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/TruststorePage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/TruststorePage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/UsersPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/UsersPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/UsersPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/UsersPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/DomainTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/DomainTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/DomainTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/DomainTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/DomainsPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/DomainsPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/DomainsPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/DomainsPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/MembersTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/MembersTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/MembersTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/MembersTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/ResourceTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/ResourceTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/ResourceTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/ResourceTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/SMLIntegrationTab.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/SMLIntegrationTab.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/domainsPage/SMLIntegrationTab.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/domainsPage/SMLIntegrationTab.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/keyStorePage/KeyStoreImportDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/keyStorePage/KeyStoreImportDialog.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/keyStorePage/KeyStoreImportDialog.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/keyStorePage/KeyStoreImportDialog.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/keyStorePage/KeystorePage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/keyStorePage/KeystorePage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/keyStorePage/KeystorePage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/keyStorePage/KeystorePage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/propertiesPage/PropGrid.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/propertiesPage/PropGrid.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/propertiesPage/PropGrid.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/propertiesPage/PropGrid.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/propertiesPage/PropertiesPage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/propertiesPage/PropertiesPage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/propertiesPage/PropertiesPage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/propertiesPage/PropertiesPage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/systemSettings/propertiesPage/PropertyPopup.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/propertiesPage/PropertyPopup.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/systemSettings/propertiesPage/PropertyPopup.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/systemSettings/propertiesPage/PropertyPopup.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/userSettings/ProfilePage.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/userSettings/ProfilePage.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/userSettings/ProfilePage.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/userSettings/ProfilePage.java
diff --git a/domiSMP-ui-tests/src/main/java/pages/userSettings/SuccesfullPasswordChangedPopup.java b/domismp-tests/domismp-tests-ui/src/main/java/pages/userSettings/SuccesfullPasswordChangedPopup.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/pages/userSettings/SuccesfullPasswordChangedPopup.java
rename to domismp-tests/domismp-tests-ui/src/main/java/pages/userSettings/SuccesfullPasswordChangedPopup.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/BaseRestClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/BaseRestClient.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/BaseRestClient.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/BaseRestClient.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/DomainClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/DomainClient.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/DomainClient.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/DomainClient.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/DomiSMPRestClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/DomiSMPRestClient.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/DomiSMPRestClient.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/DomiSMPRestClient.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/GroupClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/GroupClient.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/GroupClient.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/GroupClient.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/ResourceClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/ResourceClient.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/ResourceClient.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/ResourceClient.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/RestServicePaths.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/RestServicePaths.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/RestServicePaths.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/RestServicePaths.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/SMPRestException.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/SMPRestException.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/SMPRestException.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/SMPRestException.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/UserClient.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/UserClient.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/UserClient.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/UserClient.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/models/DocumentModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/DocumentModel.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/models/DocumentModel.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/models/DocumentModel.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/models/DomainModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/DomainModel.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/models/DomainModel.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/models/DomainModel.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/models/GroupModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/GroupModel.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/models/GroupModel.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/models/GroupModel.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/models/MemberModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/MemberModel.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/models/MemberModel.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/models/MemberModel.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/models/ResourceModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/ResourceModel.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/models/ResourceModel.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/models/ResourceModel.java
diff --git a/domiSMP-ui-tests/src/main/java/rest/models/UserModel.java b/domismp-tests/domismp-tests-ui/src/main/java/rest/models/UserModel.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/rest/models/UserModel.java
rename to domismp-tests/domismp-tests-ui/src/main/java/rest/models/UserModel.java
diff --git a/domiSMP-ui-tests/src/main/java/utils/DriverManager.java b/domismp-tests/domismp-tests-ui/src/main/java/utils/DriverManager.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/utils/DriverManager.java
rename to domismp-tests/domismp-tests-ui/src/main/java/utils/DriverManager.java
diff --git a/domiSMP-ui-tests/src/main/java/utils/FileUtils.java b/domismp-tests/domismp-tests-ui/src/main/java/utils/FileUtils.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/utils/FileUtils.java
rename to domismp-tests/domismp-tests-ui/src/main/java/utils/FileUtils.java
diff --git a/domiSMP-ui-tests/src/main/java/utils/Generator.java b/domismp-tests/domismp-tests-ui/src/main/java/utils/Generator.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/utils/Generator.java
rename to domismp-tests/domismp-tests-ui/src/main/java/utils/Generator.java
diff --git a/domiSMP-ui-tests/src/main/java/utils/TestRunData.java b/domismp-tests/domismp-tests-ui/src/main/java/utils/TestRunData.java
similarity index 84%
rename from domiSMP-ui-tests/src/main/java/utils/TestRunData.java
rename to domismp-tests/domismp-tests-ui/src/main/java/utils/TestRunData.java
index af7a897c331b3ab4819668c5100ed49f0efe93e8..70c7ad78fee218f2ab9eac44e550bfcc5828836d 100644
--- a/domiSMP-ui-tests/src/main/java/utils/TestRunData.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/utils/TestRunData.java
@@ -44,11 +44,13 @@ public class TestRunData {
         ;
 
         String propertyName;
+        String propertyEnvName;
         String defaultValue;
         String description;
 
         TestEnvironmentProperty(String propertyName, String defaultValue, String description) {
             this.propertyName = propertyName;
+            this.propertyEnvName = propertyName.toUpperCase().replace(".", "_");
             this.defaultValue = defaultValue;
             this.description = description;
         }
@@ -57,6 +59,15 @@ public class TestRunData {
             return propertyName;
         }
 
+        /**
+         * Returns the environment property name with uppercase and _ instead of .
+         *
+         * @return
+         */
+        public String getEnvPropertyName() {
+            return propertyEnvName;
+        }
+
         public String getDefaultValue() {
             return defaultValue;
         }
@@ -121,6 +132,7 @@ public class TestRunData {
         getCookies().clear();
 
     }
+
     public void setUserId(String userId) {
         this.userId = userId;
     }
@@ -226,9 +238,31 @@ public class TestRunData {
         return System.getProperty("user.dir") + File.separator + "downloadFiles";
     }
 
+    /**
+     * Returns the property value in following precedence order:
+     * System property, environment property, test.properties.path, default value
+     *
+     * @param propertyName property name to get value for
+     * @return property value or default value if property is not found
+     */
     public String getPropertyValue(TestEnvironmentProperty propertyName) {
-        String value = System.getProperty(propertyName.getPropertyName(), prop.getProperty(propertyName.getPropertyName(), propertyName.getDefaultValue()));
-       // LOG.debug("Get Property [{}] value: [{}]", propertyName.getPropertyName(), value);
+
+        String value;
+        String source;
+        if (System.getProperties().containsKey(propertyName.getPropertyName())) {
+            value = System.getProperty(propertyName.getPropertyName());
+            source = "system property";
+        } else if (System.getenv().containsKey(propertyName.getEnvPropertyName())) {
+            source = "system ENV property";
+            value = System.getenv().get(propertyName.getEnvPropertyName());
+        } else if (prop.containsKey(propertyName.getPropertyName())) {
+            source = "file property";
+            value = prop.getProperty(propertyName.getPropertyName());
+        } else {
+            source = "default";
+            value = propertyName.getDefaultValue();
+        }
+        LOG.trace("Get Property [{}] from [{}] value: [{}]", propertyName.getPropertyName(), source, value);
         return value;
     }
 
diff --git a/domiSMP-ui-tests/src/main/java/utils/Utils.java b/domismp-tests/domismp-tests-ui/src/main/java/utils/Utils.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/utils/Utils.java
rename to domismp-tests/domismp-tests-ui/src/main/java/utils/Utils.java
diff --git a/domiSMP-ui-tests/src/main/java/utils/XMLUtils.java b/domismp-tests/domismp-tests-ui/src/main/java/utils/XMLUtils.java
similarity index 100%
rename from domiSMP-ui-tests/src/main/java/utils/XMLUtils.java
rename to domismp-tests/domismp-tests-ui/src/main/java/utils/XMLUtils.java
diff --git a/domiSMP-ui-tests/src/main/resources/bambooE2.properties b/domismp-tests/domismp-tests-ui/src/main/resources/bambooE2.properties
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/bambooE2.properties
rename to domismp-tests/domismp-tests-ui/src/main/resources/bambooE2.properties
diff --git a/domiSMP-ui-tests/src/main/resources/keystore/asdasdsadasda.pkcs12 b/domismp-tests/domismp-tests-ui/src/main/resources/keystore/asdasdsadasda.pkcs12
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/keystore/asdasdsadasda.pkcs12
rename to domismp-tests/domismp-tests-ui/src/main/resources/keystore/asdasdsadasda.pkcs12
diff --git a/domiSMP-ui-tests/src/main/resources/keystore/expired_keystore_JKS.jks b/domismp-tests/domismp-tests-ui/src/main/resources/keystore/expired_keystore_JKS.jks
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/keystore/expired_keystore_JKS.jks
rename to domismp-tests/domismp-tests-ui/src/main/resources/keystore/expired_keystore_JKS.jks
diff --git a/domiSMP-ui-tests/src/main/resources/keystore/gateway_truststore.jks b/domismp-tests/domismp-tests-ui/src/main/resources/keystore/gateway_truststore.jks
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/keystore/gateway_truststore.jks
rename to domismp-tests/domismp-tests-ui/src/main/resources/keystore/gateway_truststore.jks
diff --git a/domiSMP-ui-tests/src/main/resources/keystore/gateway_truststore.zip b/domismp-tests/domismp-tests-ui/src/main/resources/keystore/gateway_truststore.zip
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/keystore/gateway_truststore.zip
rename to domismp-tests/domismp-tests-ui/src/main/resources/keystore/gateway_truststore.zip
diff --git a/domiSMP-ui-tests/src/main/resources/keystore/valid_keystore.jks b/domismp-tests/domismp-tests-ui/src/main/resources/keystore/valid_keystore.jks
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/keystore/valid_keystore.jks
rename to domismp-tests/domismp-tests-ui/src/main/resources/keystore/valid_keystore.jks
diff --git a/domiSMP-ui-tests/src/main/resources/logback.xml b/domismp-tests/domismp-tests-ui/src/main/resources/logback.xml
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/logback.xml
rename to domismp-tests/domismp-tests-ui/src/main/resources/logback.xml
diff --git a/domiSMP-ui-tests/src/main/resources/myLocal.properties b/domismp-tests/domismp-tests-ui/src/main/resources/myLocal.properties
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/myLocal.properties
rename to domismp-tests/domismp-tests-ui/src/main/resources/myLocal.properties
diff --git a/domiSMP-ui-tests/src/main/resources/truststore/expiredCertificate.cer b/domismp-tests/domismp-tests-ui/src/main/resources/truststore/expiredCertificate.cer
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/truststore/expiredCertificate.cer
rename to domismp-tests/domismp-tests-ui/src/main/resources/truststore/expiredCertificate.cer
diff --git a/domiSMP-ui-tests/src/main/resources/truststore/validCertificate.cer b/domismp-tests/domismp-tests-ui/src/main/resources/truststore/validCertificate.cer
similarity index 100%
rename from domiSMP-ui-tests/src/main/resources/truststore/validCertificate.cer
rename to domismp-tests/domismp-tests-ui/src/main/resources/truststore/validCertificate.cer
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/SeleniumTest.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/SeleniumTest.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/SeleniumTest.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/SeleniumTest.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/DomainsPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/DomainsPgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/DomainsPgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/DomainsPgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditDomainsPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditDomainsPgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditDomainsPgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditDomainsPgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditGroupsPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditGroupsPgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditGroupsPgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditGroupsPgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/KeystorePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/KeystorePgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/KeystorePgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/KeystorePgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/ProfilePgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/ProfilePgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/PropertiesPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/PropertiesPgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/PropertiesPgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/PropertiesPgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/TrustorePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/TrustorePgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/TrustorePgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/TrustorePgTests.java
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/UsersPgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/UsersPgTests.java
similarity index 100%
rename from domiSMP-ui-tests/src/test/java/domiSMPTests/ui/UsersPgTests.java
rename to domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/UsersPgTests.java
diff --git a/domiSMP-ui-tests/testng.xml b/domismp-tests/domismp-tests-ui/testng.xml
similarity index 100%
rename from domiSMP-ui-tests/testng.xml
rename to domismp-tests/domismp-tests-ui/testng.xml
diff --git a/domismp-tests/pom.xml b/domismp-tests/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c82b663652a7ac7dd46382c9c144c5363e285960
--- /dev/null
+++ b/domismp-tests/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017-2024 European Commission | CEF eDelivery
+  ~
+  ~ Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+  ~ You may not use this work except in compliance with the Licence.
+  ~
+  ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the Licence for the specific language governing permissions and limitations under the Licence.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.europa.ec.edelivery</groupId>
+        <artifactId>smp-modules</artifactId>
+        <version>5.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>domismp-tests</artifactId>
+    <name>domismp-tests</name>
+    <packaging>pom</packaging>
+    <description>The sub-modules contains DomiSMP artefacts/plans for integration/end-to-end testing.</description>
+    <modules>
+        <module>domismp-docker</module>
+        <module>domismp-soapui</module>
+        <module>domismp-ui</module>
+    </modules>
+</project>
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.test-ui.yml b/smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.test-ui.yml
deleted file mode 100644
index a8a8d837599b002abb8f544c1c2853b3c8b1da13..0000000000000000000000000000000000000000
--- a/smp-docker/compose/tomcat-mysql-smp-sml/docker-compose.test-ui.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3.8'
-services:
-  ##
-  ## UI Tests
-  ##
-  testui:
-    image: ${IMAGE_TAG:-edeliverytest}/${IMAGE_SMP_TEST_UI}:${SMP_VERSION}
-    environment:
-      - TZ=CEST
-      - SCREEN_WIDTH=1920
-      - SCREEN_HEIGHT=1080
-    networks:
-      - test-network
-networks:
-  test-network:
-    external:
-      name: ${DOCKER_NETWORK_NAME:-test-smp-tomcat-mysql_default}
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/runTests-UI.sh b/smp-docker/compose/tomcat-mysql-smp-sml/runTests-UI.sh
deleted file mode 100755
index 9c1177414795bcfc0cb26f67dab028469abf163f..0000000000000000000000000000000000000000
--- a/smp-docker/compose/tomcat-mysql-smp-sml/runTests-UI.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-RESULT_FOLDER="${WORKDIR}/results"
-# clear old results
-rm -rf "${RESULT_FOLDER}"
-mkdir -p "${RESULT_FOLDER}"
-#load common functions
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions"
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
-[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
-initializeCommonVariables
-discoverApplicationVersion
-
-# define network to connect the tests
-DOCKER_NETWORK_NAME="${PLAN_PREFIX}_default"
-export DOCKER_NETWORK_NAME
-
-# Starting Docker Compose TEST (in specific project to avoid orphan container warning)
-docker compose -f docker-compose.test-ui.yml -p "run-${PLAN_PREFIX}" up
-docker cp "run-${PLAN_PREFIX}-testui-1:/results/surefire-reports" ./results
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh b/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh
deleted file mode 100755
index 33ab85b5991ed873a400fd904c89f1684b00c0f1..0000000000000000000000000000000000000000
--- a/smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-WORKDIR="$(dirname $0)"
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions"
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
-[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
-cd "${WORKDIR}" || exit 100
-initializeCommonVariables
-discoverApplicationVersion
-
-echo "Clear old containers"
-stopAndClearTestContainers
-
diff --git a/smp-docker/compose/weblogic-oracle14/stopClearCompose.sh b/smp-docker/compose/weblogic-oracle14/stopClearCompose.sh
deleted file mode 100755
index 904ded4d5879e2fe550f499f31262667107dd494..0000000000000000000000000000000000000000
--- a/smp-docker/compose/weblogic-oracle14/stopClearCompose.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-WORKDIR="$(dirname $0)"
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions"
-source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
-[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
-cd "${WORKDIR}" || exit 100
-initializeCommonVariables
-discoverApplicationVersion
-
-echo "Clear old containers"
-stopAndClearTestContainers
diff --git a/smp-docker/images/smp-test-ui/Dockerfile b/smp-docker/images/smp-test-ui/Dockerfile
deleted file mode 100644
index 674bca8f34c8eaddfdb9fb003ccdae8530bb9d21..0000000000000000000000000000000000000000
--- a/smp-docker/images/smp-test-ui/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-# create builder to install maven which is needed
-FROM eclipse-temurin:11-jdk as builder
-
-ARG MAVEN_VERSION=3.9.6
-ARG USER_HOME_DIR="/root"
-ARG SHA=706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
-ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-RUN apt-get update \
-  && apt-get install -y ca-certificates curl git gnupg dirmngr --no-install-recommends \
-  && rm -rf /var/lib/apt/lists/*
-RUN set -eux; curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
-  && echo "${SHA} *apache-maven-${MAVEN_VERSION}-bin.tar.gz" | sha512sum -c - \
-  && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc \
-  && export GNUPGHOME="$(mktemp -d)"; \
-  for key in \
-  6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 \
-  29BEA2A645F2D6CED7FB12E02B172E3E156466E8 \
-  ; do \
-  gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
-  done; \
-  gpg --batch --verify apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz
-RUN mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \
-  && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
-  && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
-
-FROM selenium/standalone-firefox:120.0
-
-ENV MAVEN_HOME /usr/share/maven
-COPY --from=builder ${MAVEN_HOME} ${MAVEN_HOME}
-COPY ./artefacts/domiSMP-ui-tests /home/${SEL_USER}/domiSMP-ui-tests
-COPY ./entrypoint.sh /sbin/entrypoint.sh
-USER root
-RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
-    && chmod 755 /sbin/entrypoint.sh \
-    && mkdir /results \
-    && chown -R ${SEL_USER}:${SEL_USER} /results \
-    && chown -R ${SEL_USER}:${SEL_USER} /home/${SEL_USER}/domiSMP-ui-tests
-# Switch back to selenium user
-USER ${SEL_USER}
-RUN cd /home/${SEL_USER}/domiSMP-ui-tests  \
-    && mvn clean verify -DskipITs -DskipTests
-ENV MAVEN_CONFIG "/home/${SEL_USER}/.m2"
-
-ENTRYPOINT ["/sbin/entrypoint.sh"]
diff --git a/smp-docker/images/smp-test-ui/entrypoint.sh b/smp-docker/images/smp-test-ui/entrypoint.sh
deleted file mode 100755
index af1645ca6395ac8f24dd4f31c3946a606a7ebbc0..0000000000000000000000000000000000000000
--- a/smp-docker/images/smp-test-ui/entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-echo '[INFO] start execution of the tests'
-cd /home/${SEL_USER}/domiSMP-ui-tests
-mvn clean verify -Dtest.properties.path=./src/main/resources/docker-firefox.properties
-EXIT_CODE=$?
-echo '[INFO] finished execution of the tests'
-cp -R /home/${SEL_USER}/domiSMP-ui-tests/target/surefire-reports /results
-cp -R /home/${SEL_USER}/domiSMP-ui-tests/target/domismp-test.log /results
-exit ${EXIT_CODE}
diff --git a/smp-ui-tests/.gitignore b/smp-ui-tests/.gitignore
deleted file mode 100644
index a0c1551c67f50c142eb6130c7266ea9bac24ec33..0000000000000000000000000000000000000000
--- a/smp-ui-tests/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# Ignore the drivers
-*.exe
-
-
-.idea/**
-.target/**
-target/**
-.\src\main\java\Main.java
\ No newline at end of file
diff --git a/smp-ui-tests/README.txt b/smp-ui-tests/README.txt
deleted file mode 100644
index 5b38e13a1f1b7c131b0125b9699139b232f712ff..0000000000000000000000000000000000000000
--- a/smp-ui-tests/README.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-This folder contains the Webdriver scripts that test the SMP 4.1.0 UI
-
-Tests could not be written for any functionality that involves uploading files, 
-encountered in Domain and Users page because the select file dialog is a system dialog and not accessible from the browser.
-
-Also there are no tests for Audit functionality because this happens now only in database.
-
-* Setup:
-
-The tests are written in Java so Oracle Java 8 or above and Maven are required.
-To drive the browser ChromeDriver or GekoDriver is required. This can be downloaded from the following locations:
-ChromeDriver - http://chromedriver.storage.googleapis.com/index.html
-GekoDriver - https://github.com/mozilla/geckodriver/releases
-
-After unzipping the path to the executable need to be updated in the pom.xml file
-under "/project/profiles/profile/build/plugins/plugin/configuration/systemPropertyVariables".
-
-In the same set of variables please update the URL for the SMP home page.
-Maven parameters
- - url - Sets the SMP url without ui context. Ex.: http://localhost:7001/smp
- - gecko.driver.path - set the path to gecko driver. Ex.:  /opt/drivers/geckodriver
- - chrome.driver.path - set the path to gecko driver. Ex.:  drivers/chromedriver.exe
-
-
-* Run:
-
-** Windows:
-mvn clean test -P<profileName>
-
-** Linux:
-To run on Linux command line you need to install "Xvfb" and of course Firefox or Chromium
-(There is a crash when starting Chromium so it is better to run using Firefox until the crash is resolved)
-
-sudo xvfb-run --server-args="-screen 0 1920x1080x24" mvn test -P<profileName>
-example
-mvn clean install  -Pubuntu -Durl=http://localhost:7001/smp -Dgecko.driver.path=drivers/geckodriver
-
-
-* Reports
-
-Scripts provide multiple reports like JUnit and Surefire reports 
-but also a custom Excel report in the ./target folder.
-
-For any questions and complains please refer to the creator of these scripts - CATALIN COMANICI
\ No newline at end of file
diff --git a/smp-ui-tests/pom.xml b/smp-ui-tests/pom.xml
deleted file mode 100644
index 08f7e6ea19c232a170c90e1191e3f530d0cf9f61..0000000000000000000000000000000000000000
--- a/smp-ui-tests/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.test.smp</groupId>
-    <artifactId>SMPUIAutomation</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <url>http://localhost:8982/smp</url>
-        <gecko.driver.path>drivers/geckodriver</gecko.driver.path>
-        <chrome.driver.path>drivers/chromedriver</chrome.driver.path>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>7.0.0-beta1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>3.14.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.11</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20080701</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.10</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.19.4</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
-        </dependency>
-
-
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>smp_e5</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.22.1</version>
-                        <configuration>
-                            <failIfNoTests>true</failIfNoTests>
-                            <systemPropertyVariables>
-                                <webdriver.chrome.driver>${chrome.driver.path}</webdriver.chrome.driver>
-                                <webdriver.gecko.driver>chromedriver.exe</webdriver.gecko.driver>
-                                <reports.folder>./target/</reports.folder>
-                                <data.folder>./src/main/resources/</data.folder>
-                                <testdata.file>testData.json</testdata.file>
-                                <LONG_TIMEOUT>30</LONG_TIMEOUT>
-                                <SHORT_TIMEOUT>5</SHORT_TIMEOUT>
-                                <UI_BASE_URL>${url}/ui/</UI_BASE_URL>
-                            </systemPropertyVariables>
-                            <properties>
-                                <property>
-                                    <name>usedefaultlisteners</name>
-                                    <value>true</value>
-                                </property>
-                            </properties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>ubuntu</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.22.1</version>
-                        <configuration>
-                            <failIfNoTests>true</failIfNoTests>
-
-                            <systemPropertyVariables>
-                                <webdriver.chrome.driver>${chrome.driver.path}</webdriver.chrome.driver>
-                                <reports.folder>./target/</reports.folder>
-                                <data.folder>./src/main/resources/</data.folder>
-                                <testdata.file>testData.json</testdata.file>
-                                <LONG_TIMEOUT>30</LONG_TIMEOUT>
-                                <SHORT_TIMEOUT>15</SHORT_TIMEOUT>
-                                <UI_BASE_URL>${url}/ui/</UI_BASE_URL>
-                            </systemPropertyVariables>
-                            <properties>
-                                <property>
-                                    <name>usedefaultlisteners</name>
-                                    <value>true</value>
-                                </property>
-                            </properties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
-
-
-</project>
diff --git a/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java b/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java
deleted file mode 100644
index 8a14f470c27c0edeffedc6f5195c9883c0abf383..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package pages.components;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-public class ConfirmationDialog extends PageComponent {
-
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "yesbuttondialog_id")
-	private WebElement yesBtn;
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "nobuttondialog_id")
-	private WebElement noBtn;
-
-	public ConfirmationDialog(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public void confirm() {
-		log.info("dialog .. confirm");
-		waitForElementToBeClickable(yesBtn);
-		yesBtn.click();
-		waitForElementToBeGone(yesBtn);
-	}
-
-	public void cancel() {
-		log.info("dialog .. cancel");
-		waitForElementToBeClickable(noBtn);
-		noBtn.click();
-		waitForElementToBeGone(noBtn);
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/GenericSelect.java b/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
deleted file mode 100644
index 2075bc26f27148bfd47f14d82d71a7c07602a1ac..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package pages.components;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import pages.components.baseComponents.PageComponent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class GenericSelect extends PageComponent {
-
-	@FindBy(className = "mat-select-arrow")
-	WebElement expandoButton;
-	@FindBy(css = "div.mat-select-value span")
-	WebElement currentValueElement;
-	private WebElement container;
-	private By optionSelector = By.tagName("mat-option");
-
-	public GenericSelect(WebDriver driver, WebElement container) {
-		super(driver);
-
-		log.info("select init");
-		this.container = container;
-
-		PageFactory.initElements(new DefaultElementLocatorFactory(container), this);
-	}
-
-	private void expandSelect() {
-		log.info("expand select");
-		waitForElementToBeClickable(expandoButton);
-		waitForXMillis(500);
-		expandoButton.click();
-	}
-
-	private List<WebElement> getOptions() {
-		expandSelect();
-		log.info("getting options");
-		return wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(optionSelector));
-	}
-
-	public List<String> getOptionTexts() {
-		log.info("get displayed option texts");
-		List<WebElement> options = getOptions();
-		List<String> optionTexts = new ArrayList<>();
-
-		for (WebElement option : options) {
-			optionTexts.add(option.getText().trim());
-		}
-		return optionTexts;
-	}
-
-	public boolean selectOptionWithText(String text) {
-		log.info("selecting option with text" + text);
-		List<WebElement> options = getOptions();
-
-
-		for (WebElement option : options) {
-			if (option.getText().trim().equalsIgnoreCase(text)) {
-				waitForElementToBeClickable(option).click();
-				waitForElementToBeGone(option);
-				log.info("return type is True");
-				return true;
-			}
-		}
-		log.info(text + " option not found, could not select it");
-		return false;
-	}
-
-	public boolean selectFirstOption() {
-		log.info("selecting first option");
-		List<WebElement> options = getOptions();
-
-		WebElement option = options.get(1);
-		waitForElementToBeClickable(option).click();
-		waitForElementToBeGone(option);
-		return true;
-	}
-
-	public boolean selectWithIndex(int index) {
-		log.info("selecting the required option");
-		List<WebElement> options = getOptions();
-
-		WebElement option = options.get(index);
-		waitForElementToBeClickable(option).click();
-		waitForElementToBeGone(option);
-		return true;
-	}
-
-
-	public String getSelectedValue() {
-		log.info("getting current selected value");
-		return currentValueElement.getText().trim();
-	}
-
-	public boolean selectOptionByText(String text) {
-		log.info("(2) selecting option with text" + text);
-
-		expandoButton.click();
-
-		List<WebElement> options = wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(optionSelector));
-		for (WebElement option : options) {
-			String optionDomain = option.getText().trim();
-			if (optionDomain.equalsIgnoreCase(text)) {
-				option.click();
-				waitForElementToBeGone(option);
-				return true;
-			}
-		}
-		log.info(text + " option not found, could not select it (2)");
-		return false;
-	}
-
-	public boolean isLoaded() {
-		log.info("assert loaded state");
-		waitForElementToBeVisible(expandoButton);
-		if (!expandoButton.isDisplayed()) {
-			return false;
-		}
-		return currentValueElement.isDisplayed();
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/SandwichMenu.java b/smp-ui-tests/src/main/java/pages/components/SandwichMenu.java
deleted file mode 100644
index 73204029c5cc7e5ebc8f79e2b6bd5224e1bd042d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/SandwichMenu.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package pages.components;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import pages.password.PasswordChangepopup;
-import pages.service_groups.search.SearchPage;
-import utils.PROPERTIES;
-
-public class SandwichMenu extends PageComponent {
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "settingsmenu_id")
-	WebElement expandoButton;
-	@FindBy(css = "div.mat-menu-content")
-	WebElement lnkContainer;
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "currentuser_id")
-	WebElement currentUserID;
-	@FindBy(id = "logout_id")
-	WebElement logoutLnk;
-	@FindBy(id = "changePassword_id")
-	WebElement passChangeLnk;
-
-	public SandwichMenu(WebDriver driver) {
-		super(driver);
-		log.info("sandwich menu init");
-
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public boolean isLoggedIn() {
-		clickVoidSpace();
-
-		waitForElementToBeClickable(expandoButton).click();
-
-		boolean isLoggedIn = false;
-		try {
-			String text = waitForElementToBeVisible(lnkContainer).getText();
-			isLoggedIn = !text.contains("Not logged in");
-		} catch (Exception e) {
-		}
-
-		log.info("User login status is: " + isLoggedIn);
-
-		clickVoidSpace();
-		return isLoggedIn;
-	}
-
-	public PasswordChangepopup clickChangePasswordOption() {
-		waitForElementToBeClickable(expandoButton).click();
-		waitForElementToBeGone(expandoButton);
-		waitForElementToBeClickable(passChangeLnk).click();
-		return new PasswordChangepopup(driver);
-	}
-
-	public SearchPage logout() {
-		clickVoidSpace();
-
-		if (isLoggedIn()) {
-			waitForElementToBeClickable(expandoButton).click();
-			waitForElementToBeClickable(logoutLnk).click();
-			log.info("Logging out...");
-		}
-		return new SearchPage(driver);
-	}
-
-	public void waitForSandwichMenu() {
-		log.info("waiting for sandwich menu");
-		waitForXMillis(500);
-		waitForElementToBeVisible(expandoButton);
-	}
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/Sidebar.java b/smp-ui-tests/src/main/java/pages/components/Sidebar.java
deleted file mode 100644
index a4a7ba5b21bb62c76f4c5a627f6ee17d4ed57ee0..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/Sidebar.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package pages.components;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.Header;
-import pages.components.baseComponents.PageComponent;
-import pages.components.baseComponents.SMPPage;
-import utils.PROPERTIES;
-
-public class Sidebar extends PageComponent {
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(tagName = "mat-sidenav")
-	private WebElement sideBar;
-	private WebElement topLogo;
-	private WebElement topLogoText;
-	@FindBy(id = "sidebar_search_id")
-	private WebElement searchLnk;
-	@FindBy(id = "sidebar_edit_id")
-	private WebElement editLnk;
-	@FindBy(id = "sidebar_domain_id")
-	private WebElement domainLnk;
-	@FindBy(id = "sidebar_user_id")
-	private WebElement userLnk;
-	@FindBy(id = "sidebar_property_id")
-	private WebElement propertyLnk;
-	@FindBy(css = "mat-icon[role=img][mattooltip=Collapse]")
-	private WebElement collapseButton;
-	@FindBy(xpath = "//button[@id='sidebar_search_id']//span[text()='Search']")
-	private WebElement sidebarSearchText;
-
-	public Sidebar(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	/* Receives the Page object class as parameter and based on the class name it navigates to the appropriate page
-	 and returns an instance of that class */
-	public <T extends SMPPage> T goToPage(Class<T> expect) {
-		log.info("Navigating to " + expect.getSimpleName());
-
-		switch (expect.getSimpleName()) {
-			case "SearchPage":
-				waitForElementToBeClickable(searchLnk).click();
-				break;
-			case "EditPage":
-				waitForElementToBeClickable(editLnk).click();
-				break;
-			case "DomainPage":
-				waitForElementToBeClickable(domainLnk).click();
-				break;
-			case "UsersPage":
-				waitForElementToBeClickable(userLnk).click();
-				break;
-			case "PropertiesPage":
-				waitForElementToBeClickable(propertyLnk).click();
-				break;
-		}
-
-		waitForXMillis(500);
-
-		new Header(driver).waitForTitleToBe();
-
-		waitForRowsToLoad();
-
-		return PageFactory.initElements(driver, expect);
-	}
-
-	public boolean isSearchLnkEnabled() {
-		return isVisible(searchLnk) && isEnabled(searchLnk);
-	}
-
-	public boolean isEditLnkEnabled() {
-		return isVisible(editLnk) && isEnabled(editLnk);
-	}
-
-	public boolean isDomainLnkEnabled() {
-		return isVisible(domainLnk) && isEnabled(domainLnk);
-	}
-
-	public boolean isUsersLnkEnabled() {
-		return isVisible(userLnk) && isEnabled(userLnk);
-	}
-
-	public boolean isSidebarSearchTextEnable() {
-		return isVisible(sidebarSearchText) && isEnabled(sidebarSearchText);
-	}
-
-	public void collapsingSideBar() {
-		collapseButton.click();
-	}
-
-	public void expandingSideBar() {
-		driver.findElement(By.cssSelector("mat-icon[role=img][mattooltip=Expand]")).click();
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/baseComponents/Header.java b/smp-ui-tests/src/main/java/pages/components/baseComponents/Header.java
deleted file mode 100644
index e5535ddcfb1ce2dff21efaf0c617c44b0b5b07fe..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/baseComponents/Header.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package pages.components.baseComponents;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.SandwichMenu;
-import pages.login.LoginPage;
-import utils.PROPERTIES;
-
-public class Header extends PageComponent {
-
-	public SandwichMenu sandwichMenu = new SandwichMenu(driver);
-	@FindBy(id = "_header_id")
-	private WebElement pageTitle;
-
-	@FindBy(css = ".helpMenu")
-	private WebElement helpLnk;
-
-	@FindBy(css = "#sandwichMenu a")
-	private WebElement loginLnk;
-
-	@FindBy(css = "#sandwichMenu .ng-star-inserted")
-	private WebElement role;
-
-	public Header(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public LoginPage goToLogin() {
-		log.info("Going to login page");
-		waitForElementToBeClickable(loginLnk).click();
-		return new LoginPage(driver);
-	}
-
-
-	public void waitForTitleToBe(String title) {
-		log.info("waiting for page title to be " + title);
-		waitForXMillis(500);
-		waitForElementToHaveText(pageTitle, title);
-	}
-
-	public void waitForTitleToBe() {
-		log.info("waiting for page title to be present");
-		waitForXMillis(500);
-		waitForElementToBeVisible(pageTitle);
-	}
-
-	public String getRoleName() {
-		String getUserRole = role.getText();
-		String roleName = getUserRole.split(":")[0].trim();
-		return roleName;
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java b/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java
deleted file mode 100644
index c882b8d5e57ba8da3db2ccb537687d177fd3e170..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package pages.components.baseComponents;
-
-
-import org.apache.log4j.Logger;
-import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedCondition;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-import utils.PROPERTIES;
-
-
-public class PageComponent {
-
-	protected WebDriver driver;
-	protected WebDriverWait wait;
-	protected Logger log = Logger.getLogger(this.getClass());
-	protected By loadingBar = By.cssSelector(".container .bar");
-
-
-	public PageComponent(WebDriver driver) {
-		this.driver = driver;
-		this.wait = new WebDriverWait(this.driver, PROPERTIES.TIMEOUT);
-	}
-
-	public WebElement waitForElementToBeClickable(WebElement element) {
-		return wait.until(ExpectedConditions.elementToBeClickable(element));
-	}
-
-	public WebElement waitForElementToBeVisible(WebElement element) {
-		return wait.until(ExpectedConditions.visibilityOf(element));
-	}
-
-	public WebElement waitForElementToBeVisible(By elementSelector) {
-		return wait.until(ExpectedConditions.visibilityOfElementLocated(elementSelector));
-	}
-
-	public void waitForElementToBeEnabled(WebElement element) {
-		int maxTimeout = PROPERTIES.SHORT_UI_TIMEOUT * 1000;
-		int waitedSoFar = 0;
-		while ((null != element.getAttribute("disabled")) && (waitedSoFar < maxTimeout)) {
-			waitedSoFar += 100;
-			waitForXMillis(100);
-		}
-	}
-
-	public void waitForElementToBeDisabled(WebElement element) {
-		int maxTimeout = PROPERTIES.SHORT_UI_TIMEOUT * 1000;
-		int waitedSoFar = 0;
-		while ((null == element.getAttribute("disabled")) && (waitedSoFar < maxTimeout)) {
-			waitedSoFar += 100;
-			waitForXMillis(100);
-		}
-	}
-
-	public void waitForElementToBeGone(WebElement element) {
-		waitForXMillis(1000);
-	}
-
-
-	public void waitForNumberOfWindowsToBe(int noOfWindows) {
-		try {
-			wait.until(numberOfWindowsToBe(noOfWindows));
-		} catch (Exception e) {
-		}
-	}
-
-	public void clearAndFillInput(WebElement element, String toFill) {
-
-		log.info("clearing input");
-		waitForElementToBeEnabled(element);
-		element.clear();
-		element.sendKeys(toFill);
-		log.info("filled in text " + toFill);
-	}
-
-	public void clickVoidSpace() {
-		log.info("clicking void");
-		try {
-			waitForXMillis(500);
-			((JavascriptExecutor) driver).executeScript("document.querySelector('[class*=\"overlay-backdrop\"]').click()");
-			waitForXMillis(500);
-		} catch (Exception e) {
-		}
-		waitForXMillis(500);
-	}
-
-	private ExpectedCondition<Boolean> numberOfWindowsToBe(final int numberOfWindows) {
-		return new ExpectedCondition<Boolean>() {
-			@Override
-			public Boolean apply(WebDriver driver) {
-				driver.getWindowHandles();
-				return driver.getWindowHandles().size() == numberOfWindows;
-			}
-		};
-	}
-
-	public void waitForXMillis(Integer millis) {
-		try {
-			Thread.sleep(millis);
-		} catch (InterruptedException e) {
-			log.error("EXCEPTION: ", e);
-		}
-	}
-
-	public void waitForAttributeNotEmpty(WebElement element, String attributeName) {
-		wait.until(ExpectedConditions.attributeToBeNotEmpty(element, attributeName));
-	}
-
-	public void waitForElementToHaveText(WebElement element, String title) {
-		wait.until(ExpectedConditions.textToBePresentInElement(element, title));
-	}
-
-	public void waitForElementToBe(WebElement element) {
-
-		wait.until(ExpectedConditions.visibilityOf(element));
-	}
-
-	public void waitForAttributeToContain(WebElement element, String attributeName, String value) {
-		wait.until(ExpectedConditions.attributeContains(element, attributeName, value));
-	}
-
-	public void waitForElementToHaveText(WebElement element) {
-		wait.until(new ExpectedCondition<Boolean>() {
-			@Override
-			public Boolean apply(WebDriver driver) {
-				return !element.getText().trim().isEmpty();
-			}
-		});
-	}
-
-	public void waitForElementToContainText(WebElement element, String text) {
-		wait.until(ExpectedConditions.textToBePresentInElement(element, text));
-	}
-
-	public boolean isVisible(WebElement element) {
-		log.info("checking if element is visible");
-
-		try {
-			waitForElementToBe(element);
-			return element.isDisplayed();
-		} catch (Exception e) {
-		}
-		return false;
-	}
-
-	public boolean isEnabled(WebElement element) {
-		log.info("checking if element is enabled");
-		try {
-			waitForElementToBeEnabled(element);
-		} catch (Exception e) {
-			return false;
-		}
-		return element.isEnabled();
-	}
-
-	public boolean isDisabled(WebElement element) {
-		log.info("checking if element is disabled");
-		try {
-			waitForElementToBeDisabled(element);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-
-	public void waitForRowsToLoad() {
-
-		log.info("waiting for rows to load");
-		try {
-			waitForXMillis(100);
-			int bars = 1;
-			int waits = 0;
-			while (bars > 0 && waits < 30) {
-				Object tmp = ((JavascriptExecutor) driver).executeScript("return document.querySelectorAll('.container .bar').length;");
-				bars = Integer.valueOf(tmp.toString());
-				waits++;
-				waitForXMillis(200);
-			}
-			log.debug("waited for rows to load for ms = 200*" + waits);
-			waitForXMillis(200);
-		} catch (Exception e) {
-		}
-
-	}
-
-
-}
-
diff --git a/smp-ui-tests/src/main/java/pages/components/baseComponents/PaginationControls.java b/smp-ui-tests/src/main/java/pages/components/baseComponents/PaginationControls.java
deleted file mode 100644
index 951174729884a4024f4ac6035e12a2a386b7dda6..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/baseComponents/PaginationControls.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package pages.components.baseComponents;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import pages.components.GenericSelect;
-import pages.components.baseComponents.PageComponent;
-
-import java.util.List;
-
-public class PaginationControls extends PageComponent {
-
-
-	public PaginationControls(WebDriver driver) {
-		super(driver);
-		
-		log.info("initiating pagination controls!");
-		PageFactory.initElements( driver, this);
-		
-		pageSizeSelect = new GenericSelect(driver, pageSizeSelectContainer);
-	}
-
-	@FindBy(css = "li.pages")
-	List<WebElement> pgLinks;
-
-	@FindBy(css = "li.pages.active")
-	WebElement activePageLnk;
-	
-	@FindBy(css = "datatable-footer > div > datatable-pager > ul > li:nth-child(1)")
-	WebElement skipFirstLnk;
-	
-	@FindBy(css = "datatable-footer > div > datatable-pager > ul > li:nth-last-child(1)")
-	WebElement skipLastLnk;
-	
-	@FindBy(css = "datatable-footer > div > datatable-pager > ul > li:nth-last-child(2)")
-	WebElement nextPageLnk;
-	
-	@FindBy(css = "datatable-footer > div > datatable-pager > ul > li:nth-child(2)")
-	WebElement prevPageLnk;
-	
-	
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "pagesize_id")
-	WebElement pageSizeSelectContainer;
-	public GenericSelect pageSizeSelect;
-	
-	@FindBy(css = "datatable-footer > div > div.page-count")
-	WebElement pageCount;
-
-	
-	public boolean hasNextPage(){
-		return !("disabled".equalsIgnoreCase(nextPageLnk.getAttribute("class")));
-	}
-	
-	public int getExpectedNoOfPages(){
-		
-		log.info("getting expected number of pages");
-		
-		int noOfItems = getTotalItems();
-		int itemsPerPg = Integer.valueOf(pageSizeSelect.getSelectedValue());
-		
-		return (int) Math.ceil((double)noOfItems/itemsPerPg);
-	}
-	
-	public int getNoOfItemsOnLastPg(){
-		
-		log.info("getting expected number of items on last page");
-		
-		int noOfItems = getTotalItems();
-		int itemsPerPg = Integer.valueOf(pageSizeSelect.getSelectedValue());
-		
-		return noOfItems%itemsPerPg;
-	}
-	
-	public int getItemsPerPage(){
-		int itemsPerPg = Integer.valueOf(pageSizeSelect.getSelectedValue());
-		
-		log.info("selected value for items per page is .. " + itemsPerPg);
-		
-		return itemsPerPg;
-	}
-	
-	
-	
-	
-	public boolean isPaginationPresent(){
-		log.info("checking if pagination is present on page");
-		try {
-			return (activePageLnk.isDisplayed());
-		} catch (Exception e) {
-
-		}
-		return false;
-	}
-	
-//	if pagination is not present we return 1 by default
-	public Integer getActivePage(){
-		
-		log.info("getting active page number");
-		if(!isPaginationPresent()){return -1;}
-
-		if(!activePageLnk.isDisplayed()){return 1;}
-		return Integer.valueOf(activePageLnk.getText().trim());
-	}
-	
-	public void goToPage(int pgNo){
-		
-		log.info("going to page .. " + pgNo);
-		if(!isPaginationPresent()){return;}
-
-		for (WebElement pgLink : pgLinks) {
-			if(Integer.valueOf(pgLink.getText().trim()) == pgNo){
-				pgLink.click();
-				PageFactory.initElements(driver, this);
-				return;
-			}
-		}
-	}
-	
-	
-	public void skipToFirstPage(){
-		log.info("skip to FIRST page of results");
-		if(!isPaginationPresent()){return;}
-		try {
-			waitForElementToBeClickable(skipFirstLnk).click();
-			PageFactory.initElements(driver, this);
-		} catch (Exception e) {
-
-		}
-	}
-	
-	public void skipToLastPage(){
-		log.info("skip to last page of results");
-
-		if(!isPaginationPresent()){return;}
-
-		waitForElementToBeClickable(skipLastLnk);
-		skipLastLnk.click();
-		PageFactory.initElements(driver, this);
-	}
-	
-	public void goToNextPage(){
-		log.info("going to next page");
-
-		if(!isPaginationPresent()){return;}
-
-		nextPageLnk.click();
-		PageFactory.initElements(driver, this);
-	}
-	
-	public void goToPrevPage(){
-		log.info("going to prev page");
-
-		if(!isPaginationPresent()){return;}
-
-		prevPageLnk.click();
-		PageFactory.initElements(driver, this);
-	}
-	
-	
-	public int getTotalItems() {
-		
-		log.info("getting total number of items to be displayed");
-		
-		String raw = pageCount.getText().trim();
-		if(raw.contains("total")){
-			String[] splits = raw.split("/");
-			for (String split : splits) {
-				if(split.contains("total")){
-					String total = split.replaceAll("\\D", "");
-					return Integer.valueOf(total);
-				}
-			}
-		}
-		return 0;
-	}
-	
-	public Integer getNoOfSelectedItems(){
-		
-		log.info("getting number of selected items in grid");
-		
-		String raw = pageCount.getText().trim();
-		if(raw.contains("selected")){
-			String[] splits = raw.split("/");
-			for (String split : splits) {
-				if(split.contains("selected")){
-					String selected = split.replaceAll("\\D", "");
-					return Integer.valueOf(selected);
-				}
-			}
-		}
-		return null;
-	}
-	
-	
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/baseComponents/SMPPage.java b/smp-ui-tests/src/main/java/pages/components/baseComponents/SMPPage.java
deleted file mode 100644
index 1d1f8e83aa2785852f9cd537844bdcfc88262353..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/baseComponents/SMPPage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package pages.components.baseComponents;
-
-import org.openqa.selenium.WebDriver;
-import pages.components.Sidebar;
-import pages.components.messageArea.AlertArea;
-
-public class SMPPage extends PageComponent {
-
-	public SMPPage(WebDriver driver) {
-		super(driver);
-	}
-
-	public AlertArea alertArea = new AlertArea(driver);
-
-	public Sidebar sidebar = new Sidebar(driver);
-
-	public Header pageHeader = new Header(driver);
-
-	public void refreshPage() {
-		driver.navigate().refresh();
-		try {
-			pageHeader.sandwichMenu.waitForSandwichMenu();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		waitForXMillis(500);
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java b/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java
deleted file mode 100644
index 011f041d9768b1c5aa5c0062cef7745f401d3bf7..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/grid/BasicGrid.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package pages.components.grid;
-
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BasicGrid extends PageComponent {
-
-	@FindBy(css = "datatable-header div.datatable-row-center datatable-header-cell")
-	protected List<WebElement> gridHeaders;
-	@FindBy(css = "datatable-body-row > div.datatable-row-center.datatable-row-group")
-	protected List<WebElement> gridRows;
-	protected ArrayList<String> headerTxt = new ArrayList<String>();
-
-
-	public BasicGrid(WebDriver driver, WebElement container) {
-		super(driver);
-
-		log.info("Loading basic grid");
-		waitForRowsToLoad();
-		PageFactory.initElements(new DefaultElementLocatorFactory(container), this);
-
-		for (int i = 0; i < gridHeaders.size(); i++) {
-			headerTxt.add(gridHeaders.get(i).getText().trim());
-		}
-
-	}
-
-	public void selectRow(int rowNumber) {
-		log.info("selecting row with number ... " + rowNumber);
-		waitForRowsToLoad();
-		if (rowNumber >= gridRows.size()) {
-			return;
-		}
-		gridRows.get(rowNumber).click();
-		waitForXMillis(500);
-	}
-
-	public void doubleClickRow(int rowNumber) {
-
-		log.info("double clicking row ... " + rowNumber);
-		waitForXMillis(500);
-		if (rowNumber >= gridRows.size()) {
-			return;
-		}
-		Actions action = new Actions(driver);
-		action.doubleClick(gridRows.get(rowNumber)).perform();
-	}
-
-	public int getColumnsNo() {
-		log.info("getting number of columns");
-		return gridHeaders.size();
-	}
-
-	public int getRowsNo() {
-		return gridRows.size();
-	}
-
-	public void scrollRow(int index) {
-		JavascriptExecutor js = (JavascriptExecutor) driver;
-		js.executeScript("arguments[0].scrollIntoView();", gridRows.get(index));
-		waitForXMillis(500);
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/messageArea/AlertArea.java b/smp-ui-tests/src/main/java/pages/components/messageArea/AlertArea.java
deleted file mode 100644
index 3d51fb45b517c2eaf43291b8c6eb595b0e5cae3d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/messageArea/AlertArea.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package pages.components.messageArea;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import utils.PROPERTIES;
-import pages.components.baseComponents.PageComponent;
-
-public class AlertArea  extends PageComponent {
-
-	public AlertArea(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements( new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "alertmessage_id")
-	private WebElement alertMessage;
-
-	@FindBy(css = "#alertmessage_id span")
-	private WebElement closeAlertSpan;
-
-	public AlertMessage getAlertMessage(){
-		try {
-			waitForElementToBeVisible(alertMessage);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		if(!alertMessage.isDisplayed()){
-			log.warn("No messages displayed.");
-			return null;
-		}
-
-		String rawMessTxt = alertMessage.getText().replaceAll("\\n", "").trim();
-		String closeChr = closeAlertSpan.getText();
-		String messageTxt = rawMessTxt.replaceAll(closeChr, "").trim();
-
-		log.info("Getting alert message ...");
-		return new AlertMessage(messageTxt, alertMessage.getAttribute("class").contains("error"));
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/components/messageArea/AlertMessage.java b/smp-ui-tests/src/main/java/pages/components/messageArea/AlertMessage.java
deleted file mode 100644
index a2e92d6421c8a1179a71f2eccfc8eb40e23a0044..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/components/messageArea/AlertMessage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pages.components.messageArea;
-
-public class AlertMessage {
-
-	String message;
-	boolean isError;
-
-	public AlertMessage(String message, boolean isError) {
-		this.message = message;
-		this.isError = isError;
-	}
-
-	public String getMessage() {
-        System.out.println("message = " + message);
-        return message.replaceAll("×", "").trim();
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	public boolean isError() {
-		return isError;
-	}
-
-	public void setError(boolean error) {
-		isError = error;
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java b/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java
deleted file mode 100644
index 41b7ec3d0057a8d2f831b1471e6f45097e2d83fb..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/domain/DomainGrid.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package pages.domain;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import pages.components.grid.BasicGrid;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DomainGrid extends BasicGrid {
-	public DomainGrid(WebDriver driver, WebElement container) {
-		super(driver, container);
-	}
-
-	private By cellSelector = By.tagName("datatable-body-cell");
-
-	public List<DomainRow> getRowsInfo(){
-		log.info("getting all row info");
-		List<DomainRow> rowInfos = new ArrayList<>();
-
-		for (WebElement gridRow : gridRows) {
-			List<WebElement> cells = gridRow.findElements(cellSelector);
-
-			DomainRow row = new DomainRow();
-
-			for (int i = 0; i < headerTxt.size(); i++) {
-				switch (headerTxt.get(i)){
-					case "Domain code":
-						row.setDomainCode(cells.get(i).getText().trim());
-						break;
-					case "SML Domain":
-						row.setSmlDomain(cells.get(i).getText().trim());
-						break;
-					case "Signature CertAlias":
-						row.setSignatureCertAlias(cells.get(i).getText().trim());
-						break;
-					case "SML SMP Id":
-						row.setSmlSmpID(cells.get(i).getText().trim());
-						break;
-				}
-
-			}
-			rowInfos.add(row);
-		}
-
-		return rowInfos;
-	}
-
-	public void mouseHoverOnDomainCode(int rowNumber) {
-		WebElement element = driver.findElement(By.cssSelector(".datatable-row-wrapper:nth-child(" + rowNumber + ") .datatable-body-cell:nth-child(1) .datatable-body-cell-label span"));
-		Actions action = new Actions(driver);
-		action.moveToElement(element).build().perform();
-	}
-
-	public boolean isDomainStillPresent(String domainCode) {
-		boolean end = false;
-		List<DomainRow> rows = new ArrayList<>();
-		DomainPage page = new DomainPage(driver);
-		page.pagination.skipToFirstPage();
-
-		while (!end) {
-			rows.addAll(page.grid().getRowsInfo());
-			if (page.pagination.hasNextPage()) {
-				page.pagination.goToNextPage();
-			} else {
-				end = true;
-			}
-		}
-
-		boolean found = false;
-		for (DomainRow row : rows) {
-			if (row.getDomainCode().equalsIgnoreCase(domainCode)) {
-				found = true;
-			}
-		}
-		return found;
-	}
-
-	public int scrollToDomain(String domainCode) {
-		DomainPage page = new DomainPage(driver);
-		page.pagination.skipToFirstPage();
-
-		boolean end = false;
-		while (!end) {
-			List<DomainRow> rows = page.grid().getRowsInfo();
-			for (int i = 0; i < rows.size(); i++) {
-				if (rows.get(i).getDomainCode().equalsIgnoreCase(domainCode)) {
-					return i;
-				}
-			}
-
-			if (page.pagination.hasNextPage()) {
-				page.pagination.goToNextPage();
-			} else {
-				end = true;
-			}
-		}
-
-		return -1;
-	}
-
-	public int scrollToSmlDomain(String smlDomain) {
-		try {
-			DomainPage page = new DomainPage(driver);
-			List<DomainRow> rows;
-			int count = 0;
-			do {
-				if (count != 0) {
-					page.pagination.goToNextPage();
-				}
-				rows = page.grid().getRowsInfo();
-				for (int i = 0; i < rows.size(); i++) {
-					if (rows.get(i).getSmlDomain().equalsIgnoreCase(smlDomain)) {
-						return i;
-					}
-				}
-				count++;
-			}
-			while (page.pagination.hasNextPage());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return -1;
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainPage.java b/smp-ui-tests/src/main/java/pages/domain/DomainPage.java
deleted file mode 100644
index b1841b0f90e1295cd18209e57ec4902ea9c41ccb..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/domain/DomainPage.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package pages.domain;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.PaginationControls;
-import pages.components.baseComponents.SMPPage;
-import pages.keystore.KeyStoreEditDialog;
-import utils.PROPERTIES;
-
-public class DomainPage extends SMPPage {
-	public DomainPage(WebDriver driver) {
-		super(driver);
-		this.pageHeader.waitForTitleToBe("Domain");
-		PageFactory.initElements( new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-	
-	@FindBy(id = "searchTable")
-	private WebElement domainTableContainer;
-	
-	@FindBy(id = "cancelButton")
-	private WebElement cancelBtn;
-	
-	@FindBy(id = "saveButton")
-	private WebElement saveBtn;
-	
-	@FindBy(id = "newButton")
-	private WebElement newBtn;
-	
-	@FindBy(id = "editButton")
-	private WebElement editBtn;
-	
-	@FindBy(id = "deleteButton")
-	private WebElement deleteBtn;
-
-	@FindBy(xpath = "//span[text()=' Edit keystore']")
-	private WebElement editKeyStore;
-
-	public PaginationControls pagination = new PaginationControls(driver);
-	
-	
-	
-	public boolean isLoaded(){
-		log.info("checking if Domain page is loaded");
-		return isVisible(cancelBtn)
-				&& isVisible(saveBtn)
-				&& isVisible(newBtn)
-				&& isEnabled(newBtn)
-				&& isVisible(editBtn)
-				&& isVisible(deleteBtn);
-	}
-	
-	public boolean isCancelButtonEnabled(){
-		log.info("cancel button");
-		return isEnabled(cancelBtn);
-	}
-	public boolean isSaveButtonEnabled(){
-		log.info("save button");
-		return isEnabled(saveBtn);
-	}
-	public boolean isDeleteButtonEnabled(){
-		log.info("delete button");
-		return isEnabled(deleteBtn);
-	}
-	public boolean isEditButtonEnabled(){
-		log.info("edit button");
-		return isEnabled(editBtn);
-	}
-	public boolean isNewButtonEnabled(){
-		log.info("new button");
-		return isEnabled(newBtn);
-	}
-	
-	public ConfirmationDialog clickCancel(){
-		log.info("cancelling ..");
-		waitForElementToBeClickable(cancelBtn).click();
-		return new ConfirmationDialog(driver);
-	}
-	
-	public ConfirmationDialog clickSave(){
-		log.info("saving ...");
-		waitForElementToBeClickable(saveBtn).click();
-		return new ConfirmationDialog(driver);
-	}
-	
-	public void clickDelete(){
-		log.info("deleting ...");
-		waitForElementToBeClickable(deleteBtn).click();
-		waitForElementToBeEnabled(saveBtn);
-	}
-	public DomainPopup clickNew(){
-		log.info("clicking new ...");
-		waitForElementToBeClickable(newBtn).click();
-		return new DomainPopup(driver);
-	}
-	public DomainPopup clickEdit(){
-		log.info("editing ...");
-		waitForElementToBeClickable(editBtn).click();
-		return new DomainPopup(driver);
-	}
-
-	public KeyStoreEditDialog clickEditKeyStore(){
-		log.info("clicking edit keystore");
-		waitForElementToBeClickable(editKeyStore).click();
-		return new KeyStoreEditDialog(driver);
-	}
-	
-	
-	public DomainGrid grid(){
-		return new DomainGrid(driver, domainTableContainer);
-	}
-	
-	
-	
-	
-	
-	
-	
-}
diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java b/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
deleted file mode 100644
index 00f424fae55c715a1e73514931cca27de8098a67..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package pages.domain;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.GenericSelect;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-public class DomainPopup extends PageComponent {
-	@FindBy(css = "domain-details-dialog button:nth-child(1)")
-	WebElement okBtn;
-	@FindBy(css = "domain-details-dialog button:nth-child(2)")
-	WebElement cancelBtn;
-	@FindBy(css = "#domainCode_id")
-	WebElement domainCodeInput;
-	@FindBy(css = "#smldomain_id")
-	WebElement smlDomainInput;
-	@FindBy(css = "#signatureKeyAlias_id")
-	WebElement signatureCertSelectContainer;
-	GenericSelect signatureCertSelect;
-	@FindBy(css = "#smlSMPId_id")
-	WebElement smlSMPIdInput;
-	@FindBy(css = "span.mat-slide-toggle-bar")
-	WebElement userClientCertHeaderToggle;
-	@FindBy(css = "#smlClientCertHeaderAuth_id-input")
-	WebElement userClientCertHeaderToggleInput;
-	@FindBy(css = "#domainCode_id + div")
-	WebElement domainCodeValidationError;
-
-	@FindBy(css = "#smlSMPId_id + div")
-	WebElement smlSmpIdValidationError;
-	@FindBy(css = "#smlClientKeyAlias_id")
-	WebElement smlClientAliasSelectContainer;
-	GenericSelect smlClientAliasSelect;
-	@FindBy(css = "#MetadataTextArea")
-	private WebElement metadataTextArea;
-
-	public DomainPopup(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-
-		signatureCertSelect = new GenericSelect(driver, signatureCertSelectContainer);
-		smlClientAliasSelect = new GenericSelect(driver, smlClientAliasSelectContainer);
-
-
-	}
-
-	public void clickOK() {
-		waitForElementToBeClickable(okBtn).click();
-		waitForXMillis(500);
-		waitForElementToBeGone(okBtn);
-	}
-
-	public void clickCancel() {
-		waitForElementToBeClickable(cancelBtn).click();
-		waitForElementToBeGone(cancelBtn);
-	}
-
-	public boolean isLoaded() {
-		log.info("checking if domain popup is properly loaded");
-
-		waitForElementToBeEnabled(okBtn);
-
-		return isVisible(okBtn)
-				&& isVisible(domainCodeInput)
-				&& isVisible(smlDomainInput)
-				&& isVisible(cancelBtn)
-				&& isEnabled(cancelBtn)
-				&& (null != signatureCertSelect)
-				&& (null != smlClientAliasSelect);
-	}
-
-	public boolean isDomainCodeInputEnabled() {
-		log.info("domain code input");
-		return isEnabled(domainCodeInput);
-	}
-
-	public boolean isSMLDomainInputEnabled() {
-		return isEnabled(smlDomainInput);
-	}
-
-	public void fillSMLSMPIdInput(String text) {
-		log.info("fill sml smp input with " + text);
-		waitForXMillis(500);
-		clearAndFillInput(smlSMPIdInput, text);
-	}
-
-	public void fillDataForNewDomain(String domainCode, String smlDomain, String smlSmpID, String clientCertHeader) {
-		log.info("filling data for new domain");
-		clearAndFillInput(domainCodeInput, domainCode);
-		clearAndFillInput(smlDomainInput, smlDomain);
-		signatureCertSelect.selectFirstOption();
-		clearAndFillInput(smlSMPIdInput, smlSmpID);
-		smlClientAliasSelect.selectFirstOption();
-	}
-
-	public String domainCodeValidationGetErrMsg() {
-		try {
-			waitForElementToBeVisible(domainCodeValidationError);
-			return domainCodeValidationError.getText();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-
-	public String getDuplicateDomainErrorMsgText() {
-		WebElement duplicateDomainErrorMsg = driver.findElement(By.cssSelector(".mat-form-field-infix > div.ng-star-inserted"));
-		return duplicateDomainErrorMsg.getText();
-	}
-
-	public String getSmlSmpIdValidationMsg() {
-		WebElement invalidSmlSmpIdErrorMsg = driver.findElement(By.cssSelector("div.mat-form-field-infix > div.ng-star-inserted"));
-		try {
-			waitForElementToBeVisible(invalidSmlSmpIdErrorMsg);
-			return invalidSmlSmpIdErrorMsg.getText();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public boolean isEnableOkButton() {
-		try {
-			return okBtn.isEnabled();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	public boolean isEnableCancelButton() {
-		try {
-			return cancelBtn.isEnabled();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-
-	}
-
-	public String xmlFieldVALUE() {
-		log.info("value is " + metadataTextArea.getAttribute("value"));
-		return metadataTextArea.getAttribute("value");
-	}
-
-	public void clearAndFillDomainCodeInput(String domainCode) {
-		log.info("clear and fill domain code data");
-		clearAndFillInput(domainCodeInput, domainCode);
-	}
-
-	public void clearAndFillSMLDomainInput(String SMLDomain) {
-		log.info("filling only domain code data for new domain");
-		clearAndFillInput(smlDomainInput, SMLDomain);
-	}
-
-	public void clickUserClientCertHeaderToggle() {
-		waitForElementToBeClickable(userClientCertHeaderToggle);
-		waitForXMillis(500);
-		userClientCertHeaderToggle.click();
-		waitForXMillis(500);
-
-	}
-
-	public String checkedUserClientCertHeaderToggl() {
-
-		return userClientCertHeaderToggleInput.getAttribute("aria-checked");
-
-
-	}
-
-
-	public String domainCode63CharValidationGetErrMsg() {
-		try {
-			return waitForElementToBeVisible(domainCodeValidationError).getText().trim();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public String getSmlSmpId63CharValidationMsg() {
-		try {
-			return waitForElementToBeVisible(smlSmpIdValidationError).getText().trim();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainRow.java b/smp-ui-tests/src/main/java/pages/domain/DomainRow.java
deleted file mode 100644
index 01c339ecd166a4d855faf1ccefd534c989fc192c..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/domain/DomainRow.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package pages.domain;
-
-public class DomainRow{
-
-	private String domainCode;
-	private String smlDomain;
-	private String smlSmpID;
-	private String clientCertHeader;
-	private String clientCertAlias;
-	private String signatureCertAlias;
-	
-	
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-		
-		DomainRow row = (DomainRow) o;
-		
-		if (domainCode != null ? !domainCode.equals(row.domainCode) : row.domainCode != null) return false;
-		if (smlDomain != null ? !smlDomain.equals(row.smlDomain) : row.smlDomain != null) return false;
-		if (smlSmpID != null ? !smlSmpID.equals(row.smlSmpID) : row.smlSmpID != null) return false;
-		if (clientCertHeader != null ? !clientCertHeader.equals(row.clientCertHeader) : row.clientCertHeader != null)
-			return false;
-		if (clientCertAlias != null ? !clientCertAlias.equals(row.clientCertAlias) : row.clientCertAlias != null)
-			return false;
-		return signatureCertAlias != null ? signatureCertAlias.equals(row.signatureCertAlias) : row.signatureCertAlias == null;
-	}
-	
-	
-	@Override
-	public String toString() {
-		return "DomainRow{" +
-				"domainCode='" + domainCode + '\'' +
-				", smlDomain='" + smlDomain + '\'' +
-				", smlSmpID='" + smlSmpID + '\'' +
-				", clientCertHeader='" + clientCertHeader + '\'' +
-				", clientCertAlias='" + clientCertAlias + '\'' +
-				", signatureCertAlias='" + signatureCertAlias + '\'' +
-				'}';
-	}
-	
-	public String getDomainCode() {
-		return domainCode;
-	}
-	
-	public void setDomainCode(String domainCode) {
-		this.domainCode = domainCode;
-	}
-	
-	public String getSmlDomain() {
-		return smlDomain;
-	}
-	
-	public void setSmlDomain(String smlDomain) {
-		this.smlDomain = smlDomain;
-	}
-	
-	public String getSmlSmpID() {
-		return smlSmpID;
-	}
-	
-	public void setSmlSmpID(String smlSmpID) {
-		this.smlSmpID = smlSmpID;
-	}
-	
-	public String getClientCertHeader() {
-		return clientCertHeader;
-	}
-	
-	public void setClientCertHeader(String clientCertHeader) {
-		this.clientCertHeader = clientCertHeader;
-	}
-	
-	public String getClientCertAlias() {
-		return clientCertAlias;
-	}
-	
-	public void setClientCertAlias(String clientCertAlias) {
-		this.clientCertAlias = clientCertAlias;
-	}
-	
-	public String getSignatureCertAlias() {
-		return signatureCertAlias;
-	}
-	
-	public void setSignatureCertAlias(String signatureCertAlias) {
-		this.signatureCertAlias = signatureCertAlias;
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreEditDialog.java b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreEditDialog.java
deleted file mode 100644
index 7b2c1ead8078f78c7ae956fad86ac93126fcce0c..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreEditDialog.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package pages.keystore;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import pages.domain.DomainPage;
-import utils.PROPERTIES;
-
-
-public class KeyStoreEditDialog extends PageComponent {
-
-	@FindBy(css = "#keystoreTable_id")
-	private WebElement keystoreTable;
-	@FindBy(xpath = "//span[text()='Import keystore']")
-	private WebElement importKeystore;
-	@FindBy(css = "button[mat-dialog-close]")
-	private WebElement closeBtn;
-
-	public KeyStoreEditDialog(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-
-	}
-
-	public KeyStoreImportDialog clickImportKeystore() {
-		log.info("clicking import keystore");
-		waitForElementToBeClickable(importKeystore).click();
-		waitForElementToBeGone(importKeystore);
-		return new KeyStoreImportDialog(driver);
-	}
-
-	public DomainPage clickCloseInKeystore() {
-		log.info("clicking close btn in keystore edit dialog");
-		waitForElementToBeClickable(closeBtn).click();
-		waitForElementToBeGone(closeBtn);
-		return new DomainPage(driver);
-	}
-
-	public KeyStoreGrid grid() {
-		return new KeyStoreGrid(driver, keystoreTable);
-	}
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java
deleted file mode 100644
index 0236d8c2355e7a903ab1490e11cd19345d88e28d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreGrid.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package pages.keystore;
-
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.PageComponent;
-import pages.components.grid.BasicGrid;
-import pages.domain.DomainRow;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class KeyStoreGrid extends BasicGrid {
-
-    public KeyStoreGrid(WebDriver driver, WebElement container) {
-        super(driver,container);
-        log.info("Loading KeyStoreGrid");
-        waitForRowsToLoad();
-        PageFactory.initElements(new DefaultElementLocatorFactory(container), this);
-    }
-
-
-   private By cellSelector = By.cssSelector("#keystoreTable_id datatable-body-cell");
-
-
-
-    public ConfirmationDialog deleteKeyStore(int rowNum) {
-        WebElement gridRow = gridRows.get(rowNum);
-        List<WebElement> cells = gridRow.findElements(cellSelector);
-        WebElement deleteButton = cells.get(2).findElement(By.cssSelector("button[mattooltip='Delete certificate']"));
-        waitForElementToBeClickable(deleteButton).click();
-        return new ConfirmationDialog(driver);
-    }
-}
diff --git a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java
deleted file mode 100644
index 9162566688ce3da2678e212925f8b9038a93b4ab..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreImportDialog.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package pages.keystore;
-
-import org.apache.log4j.Logger;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-import java.io.File;
-
-public class KeyStoreImportDialog extends PageComponent {
-    protected Logger log = Logger.getLogger(this.getClass());
-
-    public KeyStoreImportDialog(WebDriver driver) {
-        super(driver);
-        PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-    }
-
-    @FindBy(xpath = "//span[text()='Import']")
-    private WebElement importBtn;
-
-    @FindBy(css = "keystore-import-dialog button[mat-dialog-close]")
-    private WebElement cancelBtn;
-
-    @FindBy(css = "button[mat-dialog-close]")
-    private WebElement closeBtn;
-
-    @FindBy(css = "#keystore-file-upload")
-    private WebElement chooseKeystore;
-
-    @FindBy(css = "#keystoreFilename")
-    private WebElement keyStoreFileInput;
-
-    @FindBy(css = "#password_id")
-    private WebElement passwordInput;
-
-    public KeyStoreEditDialog clickImportBtn() {
-        log.info("clicking import btn ");
-        waitForElementToBeClickable(importBtn).click();
-        waitForElementToBeGone(importBtn);
-        return new KeyStoreEditDialog(driver);
-
-    }
-
-    public KeyStoreEditDialog clickCancelBtn() {
-        log.info("clicking import keystore");
-        waitForElementToBeClickable(cancelBtn).click();
-        waitForElementToBeGone(cancelBtn);
-        return new KeyStoreEditDialog(driver);
-    }
-
-    public KeyStoreEditDialog clickCloseBtn() {
-        log.info("clicking close btn");
-        waitForElementToBeClickable(closeBtn).click();
-        waitForElementToBeGone(closeBtn);
-        return new KeyStoreEditDialog(driver);
-    }
-
-    public void chooseKeystoreFile(String relativePath) {
-        String path = new File(relativePath).getAbsolutePath();
-        chooseKeystore.sendKeys(path);
-    }
-
-    public void fillPassword(String password) {
-        waitForElementToBeVisible(passwordInput).sendKeys(password);
-    }
-
-    public String getKeyStoreFileName() {
-        return keyStoreFileInput.getAttribute("value");
-    }
-}
-
diff --git a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreRow.java b/smp-ui-tests/src/main/java/pages/keystore/KeyStoreRow.java
deleted file mode 100644
index e828608dbd5150123658406caf3b1bdb3ae7567a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/keystore/KeyStoreRow.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package pages.keystore;
-
-import pages.domain.DomainRow;
-
-public class KeyStoreRow {
-
-    private String alias;
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-    public String getAlias() {
-        return alias;
-    }
-
-    private String certificateId;
-
-    public String getCertificateId() {
-        return certificateId;
-    }
-
-    public void setCertificateId(String certificateId) {
-        this.certificateId = certificateId;
-    }
-
-    @Override
-    public String toString() {
-        return "KeyStoreRow{" +
-                "alias='" + alias + '\'' +
-                ", certificateId='" + certificateId + '\'' +
-                '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        KeyStoreRow row = (KeyStoreRow) o;
-
-        if (alias != null ? !alias.equals(row.alias) : row.alias != null) return false;
-        return certificateId != null ? certificateId.equals(row.certificateId) : row.certificateId == null;
-    }
-}
diff --git a/smp-ui-tests/src/main/java/pages/login/LoginPage.java b/smp-ui-tests/src/main/java/pages/login/LoginPage.java
deleted file mode 100644
index 5f8ac28fad970197551d33ea50ec21630e9b310d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/login/LoginPage.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package pages.login;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.SMPPage;
-import pages.service_groups.search.SearchPage;
-import utils.PROPERTIES;
-import utils.TestDataProvider;
-
-import java.util.HashMap;
-
-public class LoginPage extends SMPPage {
-
-	@FindBy(id = "username_id")
-	private WebElement username;
-	@FindBy(id = "password_id")
-	private WebElement password;
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "loginbutton_id")
-	private WebElement loginBtn;
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "okbuttondialog_id")
-	private WebElement dialogOKBtn;
-	@FindBy(className = "smpVersion")
-	private WebElement smpVersion;
-
-	public LoginPage(WebDriver driver) {
-		super(driver);
-
-		log.info(".... init");
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public boolean isLoaded() {
-
-		log.info("check if Login page is loaded");
-
-		if (!isEnabled(username)) {
-			log.error("Could not find username input!");
-			return false;
-		}
-		if (!isEnabled(password)) {
-			log.error("Could not find password input!");
-			return false;
-		}
-		if (!isVisible(loginBtn)) {
-			log.error("Could not find login button!");
-			return false;
-		}
-
-		if (!isVisible(smpVersion)) {
-			log.error("Could not find version text!");
-			return false;
-		}
-		log.info("Login page controls loaded!");
-		return true;
-	}
-
-	public <T extends SMPPage> T login(String user, String pass, Class<T> expect) {
-		log.info("Login started!!");
-
-		clearAndFillInput(username, user);
-		clearAndFillInput(password, pass);
-
-		waitForElementToBeClickable(loginBtn);
-		loginBtn.click();
-
-		closeChangePassModal();
-
-		log.info("Login action done!");
-
-		return PageFactory.initElements(driver, expect);
-	}
-
-	public SearchPage login(String user, String pass) {
-		log.info("Login started!!");
-
-		clearAndFillInput(username, user);
-		clearAndFillInput(password, pass);
-
-		waitForElementToBeClickable(loginBtn);
-		loginBtn.click();
-
-		closeChangePassModal();
-		log.info("Login action done!");
-
-		return new SearchPage(driver);
-	}
-
-	public void invalidLogin(String user, String pass) {
-		log.info("Invalid login started!!");
-
-		clearAndFillInput(username, user);
-		clearAndFillInput(password, pass);
-
-		waitForElementToBeClickable(loginBtn);
-		loginBtn.click();
-	}
-
-	public SearchPage login(String role) {
-		log.info("Login started!!");
-
-		HashMap<String, String> user = new TestDataProvider().getUserWithRole(role);
-
-		clearAndFillInput(username, user.get("username"));
-		clearAndFillInput(password, user.get("password"));
-
-		waitForElementToBeClickable(loginBtn);
-		loginBtn.click();
-
-		closeChangePassModal();
-
-		log.info("Login action done!");
-
-		return new SearchPage(driver);
-	}
-
-
-	public String getListedSMPVersion() {
-		log.info("getting listed version");
-		return waitForElementToBeVisible(smpVersion).getText().trim();
-	}
-
-	public String getTextInUsernameInput() {
-		log.info("getting text in username input");
-		return waitForElementToBeVisible(username).getText().trim();
-	}
-
-	public String getTextInPasswordInput() {
-		log.info("getting text in pass input");
-		return waitForElementToBeVisible(password).getText().trim();
-	}
-
-	private void closeChangePassModal() {
-		log.info("Closing Change password modal");
-		try {
-			waitForElementToBeClickable(dialogOKBtn).click();
-			waitForElementToBeGone(dialogOKBtn);
-		} catch (Exception e) {
-		}
-	}
-
-	public void loginWithoutUserAndPassword() {
-		username.clear();
-		password.clear();
-
-	}
-
-	public boolean isLoginButtonEnable() {
-		try {
-			return !loginBtn.isEnabled();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
-	}
-
-	public void fillLoginInput(String user, String pass) {
-
-		clearAndFillInput(username, user);
-		clearAndFillInput(password, pass);
-	}
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/password/PasswordChangepopup.java b/smp-ui-tests/src/main/java/pages/password/PasswordChangepopup.java
deleted file mode 100644
index cfb1e5e5a53213f150758d3441c5aaf98bcf1a4d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/password/PasswordChangepopup.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package pages.password;
-
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.PageComponent;
-import pages.service_groups.search.SearchPage;
-import utils.PROPERTIES;
-
-public class PasswordChangepopup extends PageComponent {
-
-
-	@FindBy(id = "username_id")
-	WebElement userNameInput;
-	@FindBy(id = "emailAddress_id")
-	WebElement emailInput;
-	@FindBy(id = "np_id")
-	WebElement newPasswordInput;
-	@FindBy(id = "cnp_id")
-	WebElement confirmationInput;
-	/* @FindBy(css = "input#cp_id")
-	 WebElement adminPassInput;
-*/
-	@FindBy(xpath = "//input[@data-placeholder='Admin password for user [system]']")
-	WebElement adminPassInput;
-	@FindBy(xpath = "//input[@data-placeholder='Current password']")
-	WebElement currentPassInput;
-	@FindBy(css = "mat-form-field.username> div > div.mat-form-field-flex > div > div")
-	WebElement usernameValidationError;
-	@FindBy(css = "mat-form-field.password > div > div.mat-form-field-flex > div > div")
-	WebElement passValidationError;
-	@FindBy(css = "mat-form-field.password-confirmation > div > div.mat-form-field-flex > div > div")
-	WebElement passConfirmationValidationError;
-	@FindBy(css = ".mat-form-field-infix > div.has-error")
-	WebElement passMatchValidationError;
-	@FindBy(css = "mat-dialog-actions button:nth-child(1)")
-	WebElement okBtn;
-	@FindBy(css = "mat-dialog-actions button:nth-child(2)")
-	WebElement cancelBtn;
-
-	@FindBy(css = "smp-password-change-dialog mat-dialog-actions button:nth-child(1)")
-	WebElement changedPassword;
-	@FindBy(css = "#closebuttondialog_id")
-	WebElement passChangedClose;
-	@FindBy(css = "smp-password-change-dialog mat-dialog-actions button:nth-child(2)")
-	WebElement passwordDialogClose;
-
-	public PasswordChangepopup(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public void clickOK() {
-		log.info("click OK");
-		waitForElementToBeClickable(okBtn);
-		okBtn.click();
-		waitForElementToBeGone(okBtn);
-	}
-
-	public void clickCancel() {
-		log.info("click cancel");
-		waitForElementToBeClickable(cancelBtn);
-		cancelBtn.click();
-		waitForElementToBeGone(cancelBtn);
-	}
-
-
-	public SearchPage clickCloseAfterChangedPassForLoggedUser() {
-		log.info("click close after change password");
-		waitForElementToBeClickable(passChangedClose);
-		passChangedClose.click();
-		waitForElementToBeGone(passChangedClose);
-		return new SearchPage(driver);
-	}
-
-	public void clickCloseAfterChangedPass() {
-		log.info("click close after change password");
-
-		waitForElementToBeClickable(passChangedClose);
-		passChangedClose.click();
-		waitForElementToBeGone(passChangedClose);
-
-	}
-
-	public void setOrChangePassword(String adminPass, String newPass, String confirmPass) {
-
-		clearAndFillInput(adminPassInput, adminPass);
-		clearAndFillInput(newPasswordInput, newPass);
-		clearAndFillInput(confirmationInput, confirmPass);
-	}
-
-	public void fillDataForLoggedUser(String currentPass, String newPass, String confirmPass) {
-		clearAndFillInput(currentPassInput, currentPass);
-		clearAndFillInput(newPasswordInput, newPass);
-		clearAndFillInput(confirmationInput, confirmPass);
-	}
-
-	public ConfirmationDialog clickChangedPassword() {
-		log.info("click changed password");
-		waitForElementToBeClickable(changedPassword);
-		changedPassword.click();
-		waitForElementToBeGone(changedPassword);
-		return new ConfirmationDialog(driver);
-	}
-
-	public SearchPage clickClosePasswordDialog() {
-		passwordDialogClose.click();
-		waitForElementToBeGone(passwordDialogClose);
-		return new SearchPage(driver);
-	}
-
-	public boolean isCurrentPasswordInputEnable() {
-		boolean bool = currentPassInput.isEnabled();
-		return bool;
-	}
-
-	public boolean isNewPasswordInputEnable() {
-		boolean bool = newPasswordInput.isEnabled();
-		return bool;
-	}
-
-	public boolean isConfirmPasswordInputEnable() {
-		boolean bool = confirmationInput.isEnabled();
-		return bool;
-	}
-
-}
-
diff --git a/smp-ui-tests/src/main/java/pages/properties/PropertiesGrid.java b/smp-ui-tests/src/main/java/pages/properties/PropertiesGrid.java
deleted file mode 100644
index baca43b15b72f7ae092505063018c9068bb65372..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/properties/PropertiesGrid.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package pages.properties;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import pages.components.grid.BasicGrid;
-import pages.properties.PropertyRowInfo;
-import pages.users.UserRowInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PropertiesGrid extends BasicGrid {
-
-
-    public PropertiesGrid(WebDriver driver, WebElement container) {
-        super(driver, container);
-    }
-    public List<PropertyRowInfo> getRows() {
-        List<PropertyRowInfo> rowInfos = new ArrayList<>();
-
-        for (WebElement gridRow : gridRows) {
-            List<WebElement> cells = gridRow.findElements(By.tagName("datatable-body-cell"));
-            PropertyRowInfo rowInfo = new PropertyRowInfo();
-            rowInfo.setPropertyname(cells.get(0).getText().trim());
-            rowInfo.setPropertyvalue(cells.get(1).getText().trim());
-            rowInfos.add(rowInfo);
-        }
-        return rowInfos;
-    }
-
-    public Boolean rowContainPropertyName(String property){
-        List<PropertyRowInfo> rows = getRows();
-        int i = rows.size();
-        Boolean bool=rows.size() == 1 && rows.get(i-1).getPropertyname().equalsIgnoreCase(property);
-
-        return bool;
-
-    }
-}
diff --git a/smp-ui-tests/src/main/java/pages/properties/PropertiesPage.java b/smp-ui-tests/src/main/java/pages/properties/PropertiesPage.java
deleted file mode 100644
index cd798bc143b4c1994d9783e36276b47bd0ac2ec3..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/properties/PropertiesPage.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package pages.properties;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.PaginationControls;
-import pages.components.baseComponents.SMPPage;
-import utils.PROPERTIES;
-
-public class PropertiesPage extends SMPPage {
-	public PaginationControls pagination = new PaginationControls(driver);
-	@FindBy(id = "searchTable")
-	private WebElement propertyTableContainer;
-	@FindBy(id = "cancelButton")
-	private WebElement cancelBtn;
-	@FindBy(id = "saveButton")
-	private WebElement saveBtn;
-	@FindBy(id = "editButton")
-	private WebElement editBtn;
-	@FindBy(id = "searchProperty")
-	private WebElement searchPropertyField;
-	@FindBy(id = "searchbutton_id")
-	private WebElement searchBtn;
-
-	public PropertiesPage(WebDriver driver) {
-		super(driver);
-		this.pageHeader.waitForTitleToBe("Properties");
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public String getErrorMessage() {
-		return driver.findElement(By.cssSelector(".alert-message-error")).getText();
-	}
-
-
-	public boolean isLoaded() {
-		log.info("checking if Property page is loaded");
-		return isVisible(cancelBtn)
-				&& isVisible(saveBtn)
-				&& isVisible(editBtn);
-	}
-
-	public boolean isCancelButtonEnabled() {
-		log.info("checking cancel button is enabled");
-		return isEnabled(cancelBtn);
-	}
-
-	public boolean isSaveButtonEnabled() {
-		log.info("checking save button is enabled");
-		return isEnabled(saveBtn);
-	}
-
-	public ConfirmationDialog clickCancel() {
-		log.info("click cancel button");
-		waitForElementToBeClickable(cancelBtn).click();
-		return new ConfirmationDialog(driver);
-	}
-
-	public boolean isEditButtonEnabled() {
-		log.info("checking edit button is enabled");
-		return isEnabled(editBtn);
-	}
-
-
-	public ConfirmationDialog clickSave() {
-		log.info("click save button");
-		waitForElementToBeClickable(saveBtn).click();
-		return new ConfirmationDialog(driver);
-	}
-
-	public PropertyPopup clickEdit() {
-		log.info("click edit button");
-		waitForElementToBeClickable(editBtn).click();
-		return new PropertyPopup(driver);
-	}
-
-	public void propertySearch(String propertyname) {
-		log.info("Search for property");
-		waitForElementToBeVisible(searchPropertyField).sendKeys(propertyname);
-		waitForElementToBeClickable(searchBtn).click();
-	}
-
-	public PropertiesGrid grid() {
-		return new PropertiesGrid(driver, propertyTableContainer);
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/properties/PropertyPopup.java b/smp-ui-tests/src/main/java/pages/properties/PropertyPopup.java
deleted file mode 100644
index 464be67c4b84742a39c3ece806e33e7168f7456c..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/properties/PropertyPopup.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package pages.properties;
-
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import pages.components.GenericSelect;
-import pages.components.baseComponents.PageComponent;
-
-public class PropertyPopup extends PageComponent {
-
-        public PropertyPopup(WebDriver driver) {
-            super(driver);
-            PageFactory.initElements(driver, this);
-        }
-
-        @FindBy(css = "mat-dialog-actions button:nth-child(1)")
-        WebElement popupOkBtn;
-
-        @FindBy(css = "mat-dialog-actions button:nth-child(2)")
-        WebElement popupCancelBtn;
-
-        @FindBy(css = "span.mat-checkbox-inner-container input")
-        WebElement propertyCheckbox;
-
-        @FindBy(css = ".mat-input-element.mat-form-field-autofill-control[type='text']")
-        WebElement propertryEditInput;
-
-        public boolean isOKButtonActive() {
-            return isEnabled(popupOkBtn);
-        }
-
-        public boolean isCancelButtonActive() {
-            return isEnabled(popupCancelBtn);
-        }
-        public PropertiesPage clickOK() {
-            log.info("click OK");
-            waitForElementToBeClickable(popupOkBtn);
-            popupOkBtn.click();
-            waitForElementToBeGone(popupOkBtn);
-            return new PropertiesPage(driver);
-        }
-
-        public PropertiesPage clickCancel() {
-            log.info("click cancel");
-            waitForElementToBeClickable(popupCancelBtn);
-            popupCancelBtn.click();
-            waitForElementToBeGone(popupCancelBtn);
-            return new PropertiesPage(driver);
-        }
-       public PropertiesPage enableCheckboxOfProperty() {
-           Boolean bool = propertyCheckbox.isSelected();
-
-           if (bool == false) {
-               propertyCheckbox.click();
-               popupOkBtn.click();
-           }
-           else
-           {
-               popupCancelBtn.click();
-           }
-           return new PropertiesPage(driver);
-       }
-    public PropertiesPage disableCheckboxOfProperty(){
-        Boolean bool = propertyCheckbox.isSelected();
-        if(bool == true){
-            JavascriptExecutor executor = (JavascriptExecutor)driver;
-            executor.executeScript("arguments[0].click();", propertyCheckbox);
-            try {
-                Thread.sleep(1000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            popupOkBtn.click();
-        }
-        else
-        {
-            popupCancelBtn.click();
-        }
-        return new PropertiesPage(driver);
-
-    }
-    public void editInputField(String string)
-    {
-        propertryEditInput.sendKeys(string);
-    }
-
-
-    }
diff --git a/smp-ui-tests/src/main/java/pages/properties/PropertyRowInfo.java b/smp-ui-tests/src/main/java/pages/properties/PropertyRowInfo.java
deleted file mode 100644
index 3f5f344136d274089199ac1919dbebe5aa814aa9..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/properties/PropertyRowInfo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package pages.properties;
-
-public class PropertyRowInfo {
-    private String propertyname;
-    private String propertyvalue;
-
-    public String getPropertyname() {
-        return propertyname;
-    }
-
-    public void setPropertyname(String propertyname) {
-        this.propertyname = propertyname;
-    }
-
-    public String getPropertyvalue() {
-        return propertyvalue;
-    }
-
-    public void setPropertyvalue(String propertyvalue) {
-        this.propertyvalue = propertyvalue;
-    }
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/FilterArea.java b/smp-ui-tests/src/main/java/pages/service_groups/FilterArea.java
deleted file mode 100644
index 66576364739508399c0ef1e71119f6eb03d1e7ac..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/FilterArea.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package pages.service_groups;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.GenericSelect;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-public class FilterArea extends PageComponent {
-	public GenericSelect domainSelect;
-	@FindBy(id = "participantIdentifier")
-	private WebElement participantIdentifierInput;
-
-	@FindBy(id = "participantScheme")
-	private WebElement participantSchemeInput;
-
-	@FindBy(id = "domain_id")
-	private WebElement domainSelectContainer;
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "searchbutton_id")
-	private WebElement searchButton;
-
-	public FilterArea(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-
-		domainSelect = new GenericSelect(driver, domainSelectContainer);
-
-	}
-
-	public String getParticipantIdentifierInputValue() {
-		log.info("getting text in participant Identifier Input");
-		waitForElementToBeVisible(participantIdentifierInput);
-		return participantIdentifierInput.getText().trim();
-	}
-
-	public String getParticipantSchemeInputValue() {
-		log.info("getting text in participant Scheme Input");
-		waitForElementToBeVisible(participantSchemeInput);
-		return participantSchemeInput.getText().trim();
-	}
-
-	public boolean isLoaded() {
-		log.info("checking filter area is properly loaded");
-		if (!isVisible(participantIdentifierInput)) {
-			return false;
-		}
-		if (!isVisible(participantSchemeInput)) {
-			return false;
-		}
-		return domainSelect.isLoaded();
-	}
-
-	public void filter(String identifier, String scheme, String domain) {
-		log.info(String.format("filtering by %s, %s, %s", identifier, scheme, domain));
-		clearAndFillInput(participantIdentifierInput, identifier);
-		clearAndFillInput(participantSchemeInput, scheme);
-
-		if (null != domain && !domain.isEmpty()) {
-			domainSelect.selectOptionByText(domain);
-		}
-
-		log.info("clicking search");
-		waitForElementToBeClickable(searchButton).click();
-		waitForXMillis(1000);
-	}
-
-	public boolean isSearchButtonVisible() {
-		try {
-			return searchButton.isDisplayed();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	public boolean isSearchButtonEnable() {
-		try {
-			return searchButton.isEnabled();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/MetadataGrid.java b/smp-ui-tests/src/main/java/pages/service_groups/MetadataGrid.java
deleted file mode 100644
index bd614ea29f824e1a803927adc2905bdbfdb8f750..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/MetadataGrid.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package pages.service_groups;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import pages.components.baseComponents.PageComponent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MetadataGrid  extends PageComponent{
-	public MetadataGrid(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements( driver, this);
-	}
-
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(css = "ngx-datatable.inner-table.virtualized datatable-row-wrapper")
-	List<WebElement> rowContainers;
-
-	public List<MetadataRow> getMetadataRows(){
-		log.info("getting metadata info");
-		List<MetadataRow> rowList = new ArrayList<>();
-		for (WebElement rowContainer : rowContainers) {
-			rowList.add(new MetadataRow(driver, rowContainer));
-		}
-		return rowList;
-	}
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/MetadataRow.java b/smp-ui-tests/src/main/java/pages/service_groups/MetadataRow.java
deleted file mode 100644
index 7d02e6d95981a675faaaefd980207a5621e1167b..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/MetadataRow.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package pages.service_groups;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-
-import java.util.List;
-
-public class MetadataRow extends PageComponent {
-	public MetadataRow(WebDriver driver, WebElement container) {
-			super(driver);
-			PageFactory.initElements( new DefaultElementLocatorFactory(container) , this);
-	}
-
-	@FindBy(tagName = "datatable-body-cell")
-	protected List<WebElement> cells;
-
-	public String getDomain(){
-		return cells.get(0).getText().trim();
-	}
-
-	public String getDocumentIdentifierScheme(){
-		return cells.get(1).getText().trim();
-	}
-
-	public String getDocumentIdentifier(){
-		return cells.get(2).getText().trim();
-	}
-
-	public String getURL(){
-		return cells.get(3).findElement(By.tagName("a")).getAttribute("href").trim();
-	}
-
-	public void clickURL(){
-		cells.get(3).findElement(By.tagName("a")).click();
-	}
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupGrid.java b/smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupGrid.java
deleted file mode 100644
index 5e2d8f47f0ab7c3c47b645eeee0e1568ce1a645d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupGrid.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package pages.service_groups;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ServiceGroupGrid extends PageComponent {
-
-	public ServiceGroupGrid(WebDriver driver, WebElement container) {
-		super(driver);
-		PageFactory.initElements( new AjaxElementLocatorFactory(container, PROPERTIES.TIMEOUT) , this);
-
-		waitForRowsToLoad();
-	}
-
-	@FindBy(className = "datatable-header-cell-label")
-	List<WebElement> headers;
-
-	@FindBy(className = "datatable-row-wrapper")
-	List<WebElement> rowWrappers;
-
-	@FindBy(tagName = "datatable-body")
-	WebElement dataTableBody;
-
-	public List<ServiceGroupRow> getRows() {
-		log.info("getting row info");
-		List<ServiceGroupRow> rows = new ArrayList<>();
-
-		for (WebElement rowWrapper : rowWrappers) {
-			rows.add(new ServiceGroupRow(driver, rowWrapper));
-		}
-
-		return rows;
-	}
-
-	public boolean isLoaded(){
-		return headers.size() > 0;
-	}
-
-	public void doubleClickRow(int rowNumber) {
-		log.info("double clicking row ... " + rowNumber);
-		waitForXMillis(500);
-		if(rowNumber>=rowWrappers.size()){return ;}
-		waitForElementToBeClickable(rowWrappers.get(rowNumber));
-		Actions action = new Actions(driver);
-		action.doubleClick(rowWrappers.get(rowNumber)).perform();
-		waitForXMillis(500);
-	}
-
-	public void selectRow(int rowNumber) {
-		log.info("clicking row ... " + rowNumber);
-		waitForXMillis(500);
-		if(rowNumber>=rowWrappers.size()){return ;}
-		rowWrappers.get(rowNumber).click();
-		waitForXMillis(500);
-	}
-
-	public List<String> getHeaders(){
-		List<String> stHeaders = new ArrayList<>();
-		for (WebElement header : headers) {
-			stHeaders.add(header.getText().trim());
-		}
-		return stHeaders;
-	}
-
-	public int getRowsNo(){
-		return rowWrappers.size();
-	}
-
-
-	public <T extends ServiceGroupRow> ArrayList<T> getRowsAs(Class<T> expectedType){
-		log.info("getting rows!!!");
-		ArrayList<T> toReturn = new ArrayList<T>();
-
-		for (int i = 0; i < rowWrappers.size(); i++) {
-			Constructor<T> constructor = null;
-			T obj = null;
-			try {
-				constructor = expectedType.getDeclaredConstructor(WebDriver.class, WebElement.class);
-				obj = constructor.newInstance(driver, rowWrappers.get(i));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			toReturn.add(obj);
-		}
-		return toReturn;
-	}
-
-	public String getEmptyTableText() {
-		try{
-			return dataTableBody.findElement(By.className("empty-row")).getText();
-		}
-		catch (Exception e){
-			e.printStackTrace();
-			return "";
-		}
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupRow.java b/smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupRow.java
deleted file mode 100644
index e6cf8249716ddd85ab386e9568d2bcc87cb05d8a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupRow.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package pages.service_groups;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-
-import java.util.List;
-
-public class ServiceGroupRow extends PageComponent {
-
-	public ServiceGroupRow(WebDriver driver, WebElement container) {
-		super(driver);
-		PageFactory.initElements( new DefaultElementLocatorFactory(container) , this);
-	}
-
-
-
-
-	@FindBy(tagName = "datatable-body-cell")
-	protected List<WebElement> cells;
-    @FindBy(css = "div.datatable-row-detail.ng-star-inserted > div.ng-star-inserted")
-	private WebElement emptyMetadataContent;
-
-	@FindBy(css = ".ng-star-inserted.datatable-icon-right")
-	private WebElement expandMetadata;
-
-	public MetadataGrid expandMetadata() {
-			expandMetadata.click();
-//		todo: find something better to wait for
-			waitForXMillis(1000);
-		return new MetadataGrid(driver);
-	}
-	public void collapseMetadata(){
-			driver.findElement(By.cssSelector(".ng-star-inserted.datatable-icon-down")).click();
-	}
-
-	public Integer getMetadataSize() {
-		return Integer.valueOf(cells.get(2).getText().trim());
-	}
-
-	public String getParticipantScheme() {
-		return cells.get(3).getText().trim();
-	}
-
-	public String getParticipantIdentifier() {
-		return cells.get(4).getText().trim();
-	}
-
-	public String getServiceGroupURL() {
-		return cells.get(5).findElement(By.tagName("a")).getAttribute("href").trim();
-	}
-
-	public boolean verifyMetadataExpandButton() {
-		return expandMetadata.isEnabled();
-	}
-
-	public boolean verifyMetadataCollapseButton() {
-		WebElement collapseButton = driver.findElement(By.cssSelector(".ng-star-inserted.datatable-icon-down"));
-		return collapseButton.isDisplayed() && collapseButton.isEnabled();
-	}
-
-	public boolean isMetadataExpanded() {
-		try{
-			if(	new MetadataGrid(driver).getMetadataRows().size() >0 ){
-				return true;
-			}
-		}catch (Exception e){ e.printStackTrace();}
-		return false;
-	}
-
-	public String emptyMetadataContentText()
-	{
-		return emptyMetadataContent.getText();
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/AccordionSection.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/AccordionSection.java
deleted file mode 100644
index e19087bee8395544605eb436afcfde0808b2ac3a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/AccordionSection.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AccordionSection extends PageComponent {
-	@FindBy(css = "span.mat-content > mat-panel-title")
-	WebElement title;
-	@FindBy(css = "span.mat-content > mat-panel-description > div")
-	WebElement selectCount;
-	@FindBy(css = ".mat-expansion-indicator")
-	WebElement expandButton;
-	@FindBy(tagName = "mat-list-option")
-	List<WebElement> options;
-
-	public AccordionSection(WebDriver driver, WebElement container) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(container, PROPERTIES.TIMEOUT), this);
-	}
-
-	public boolean isExpanded() {
-		log.info("check if expanded");
-		return isVisible(options.get(0));
-	}
-
-	public String getTitle() {
-		log.info("getting title text");
-		waitForElementToBeVisible(title);
-		return title.getText().replaceAll("\\W", "").trim();
-	}
-
-	public String getSelectedCountFullText() {
-		log.info("get Selected Count Full Text");
-		waitForElementToBeVisible(selectCount);
-		return selectCount.getText().trim();
-	}
-
-	public Integer getSelectedCount() {
-		String fullText = getSelectedCountFullText();
-		return Integer.valueOf(fullText.replaceAll("\\D", ""));
-	}
-
-	public void expandSection() {
-		log.info("expanding...");
-		waitForElementToBeClickable(expandButton).click();
-		waitForElementToBeVisible(options.get(0));
-	}
-
-	public void selectOptionWithText(String text) {
-		log.info("selecting option " + text);
-		for (WebElement option : options) {
-
-			if (option.getAttribute("aria-selected").contains("true")) {
-				continue;
-			}
-
-			if (option.getText().trim().equalsIgnoreCase(text)) {
-				log.info("option found ... selecting");
-				option.click();
-				return;
-			}
-		}
-	}
-
-	public void selectOptionWithIndex(Integer index) {
-		log.info("selecting option " + index);
-		if (index >= options.size()) {
-			return;
-		}
-
-		WebElement option = options.get(index);
-		if (option.getAttribute("aria-selected").contains("true")) {
-			return;
-		}
-		waitForElementToBeClickable(option).click();
-		return;
-	}
-
-	public boolean optionsEnabled() {
-		log.info("checking if options are enabled");
-		waitForElementToBeVisible(title);
-		boolean isDisabled = options.get(0).getAttribute("aria-disabled").equalsIgnoreCase("true");
-		return !isDisabled;
-	}
-
-	public List<String> getOptions() {
-		log.info("getting options");
-		List<String> optionStr = new ArrayList<>();
-		for (WebElement option : options) {
-			optionStr.add(option.getText().trim());
-		}
-		return optionStr;
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/EditPage.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/EditPage.java
deleted file mode 100644
index e9a49660918dbbcd6d3e9c5e170290152f1c901e..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/EditPage.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.PaginationControls;
-import pages.components.baseComponents.SMPPage;
-import pages.service_groups.FilterArea;
-import pages.service_groups.ServiceGroupGrid;
-import utils.PROPERTIES;
-
-import java.util.List;
-
-public class EditPage extends SMPPage {
-	public FilterArea filterArea;
-	public PaginationControls pagination = new PaginationControls(driver);
-	@FindBy(id = "searchTable")
-	private WebElement searchTable;
-
-	@FindBy(id = "okButton")
-	private WebElement okButton;
-
-	@FindBy(id = "cancelButton")
-	private WebElement cancelButton;
-
-	@FindBy(id = "saveButton")
-	private WebElement saveButton;
-
-	@FindBy(id = "newButton")
-	private WebElement newButton;
-
-	@FindBy(id = "editButton")
-	private WebElement editButton;
-
-	@FindBy(id = "deleteButton")
-	private WebElement deleteButton;
-
-	public EditPage(WebDriver driver) {
-		super(driver);
-		this.pageHeader.waitForTitleToBe("Edit");
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-		filterArea = new FilterArea(driver);
-	}
-
-	public boolean isCancelButtonEnabled() {
-		log.info("cancel button");
-		return isEnabled(cancelButton);
-	}
-
-	public boolean isSaveButtonEnabled() {
-		log.info("save button");
-		return isEnabled(saveButton);
-	}
-
-	public boolean isDeleteButtonEnabled() {
-		log.info("delete button");
-		return isEnabled(deleteButton);
-	}
-
-	public boolean isEditButtonEnabled() {
-		log.info("edit button");
-		return isEnabled(editButton);
-	}
-
-	public boolean isNewButtonEnabled() {
-		log.info("new button");
-		return isEnabled(newButton);
-	}
-
-
-	public ServiceGroupPopup clickEdit() {
-		log.info("editing ...");
-		if (!isEditButtonEnabled()) {
-			return null;
-		}
-
-		editButton.click();
-
-		return new ServiceGroupPopup(driver);
-
-	}
-
-	public ServiceGroupPopup clickNew() {
-		log.info("new ...");
-		waitForElementToBeClickable(newButton).click();
-		return new ServiceGroupPopup(driver);
-	}
-
-	public ConfirmationDialog clickSave() {
-		log.info("saving ...");
-		waitForElementToBeClickable(saveButton).click();
-		return new ConfirmationDialog(driver);
-	}
-
-	public ConfirmationDialog clickCancel() {
-		log.info("canceling ...");
-		waitForElementToBeClickable(cancelButton).click();
-		return new ConfirmationDialog(driver);
-	}
-
-	public ConfirmationDialog clickOk() {
-		log.info("canceling ...");
-		waitForElementToBeClickable(okButton).click();
-		return new ConfirmationDialog(driver);
-	}
-
-	public void clickDelete() {
-		log.info("deleting ...");
-		waitForElementToBeClickable(deleteButton).click();
-	}
-
-	public boolean isNewButtonPresent() {
-		log.info("check if NEW button is visible");
-		return isVisible(newButton);
-	}
-
-	public boolean isDeleteButtonPresent() {
-		log.info("check if DELETE button is visible");
-		return isVisible(deleteButton);
-	}
-
-
-	public ServiceGroupGrid getGrid() {
-		log.info("getting grid");
-		waitForElementToBeVisible(searchTable);
-		ServiceGroupGrid grid = new ServiceGroupGrid(driver, searchTable);
-		return grid;
-	}
-
-
-	public void addNewServiceGroup(String identifier, String scheme, List<String> owners, List<String> domains, String extension) {
-		log.info("adding new service group");
-		waitForElementToBeClickable(newButton).click();
-
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-		popup.fillForm(identifier, scheme, owners, domains, extension);
-		popup.clickOK();
-
-		waitForXMillis(300);
-	}
-
-	public void saveChangesAndConfirm() {
-		log.info("saving..");
-		waitForElementToBeClickable(saveButton).click();
-		new ConfirmationDialog(driver).confirm();
-
-		waitForRowsToLoad();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/MetadataRowE.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/MetadataRowE.java
deleted file mode 100644
index a536e956b413926cae833e93c57941bd0c6d3747..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/MetadataRowE.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import pages.service_groups.MetadataRow;
-
-import java.util.List;
-
-public class MetadataRowE extends MetadataRow {
-
-	public MetadataRowE(WebDriver driver, WebElement container) {
-		super(driver, container);
-	}
-
-	@FindBy(css = "datatable-body-cell:nth-child(5) > div > div > button:nth-child(1)")
-	WebElement editMetadataButton;
-
-	@FindBy(css = "datatable-body-cell:nth-child(5) > div > div > button:nth-child(2)")
-	WebElement deleteMetadataButton;
-
-	public void clickEdit() {
-		log.info("row action - editing ..");
-		waitForElementToBeClickable(editMetadataButton).click();
-	}
-
-	public void clickDelete() {
-		log.info("row action - deleting ..");
-		waitForElementToBeClickable(deleteMetadataButton).click();
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/SGExtensionWizzard.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/SGExtensionWizzard.java
deleted file mode 100644
index 3105acca8c2ef2f1810ce9615e8798494ca5981e..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/SGExtensionWizzard.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.Generator;
-import utils.PROPERTIES;
-
-public class SGExtensionWizzard extends PageComponent {
-	public SGExtensionWizzard(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements( new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	@FindBy(css = "#ExtensionID_id")
-	private WebElement extensionIDInput;
-
-	@FindBy(css = "#ExtensionName_id")
-	private WebElement extensionNameInput;
-
-	@FindBy(css = "#ExtensionAgencyID_id")
-	private WebElement extensionAgencyIDInput;
-
-	@FindBy(css = "#ExtensionAgencyName_id")
-	private WebElement extensionAgencyNameInput;
-
-	@FindBy(css = "#ExtensionAgencyURI_id")
-	private WebElement extensionAgencyURIInput;
-
-	@FindBy(css = "#ExtensionVersionID_id")
-	private WebElement extensionVersionIDInput;
-
-	@FindBy(css = "#ExtensionURI_id")
-	private WebElement eExtensionURIInput;
-
-	@FindBy(css = "#ExtensionReasonCode_id")
-	private WebElement extensionReasonCodeInput;
-
-	@FindBy(css = "#ExtensionReason_id")
-	private WebElement extensionReasonInput;
-
-	@FindBy(css = "service-group-extension-wizard button:nth-of-type(1)")
-	private WebElement okButton;
-
-	public void fillWithRndStrings(){
-		clearAndFillInput(extensionIDInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionNameInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionAgencyIDInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionAgencyNameInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionAgencyURIInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionVersionIDInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(eExtensionURIInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionReasonCodeInput, Generator.randomAlphaNumeric(10));
-		clearAndFillInput(extensionReasonInput, Generator.randomAlphaNumeric(10));
-		waitForElementToBeClickable(okButton).click();
-		waitForElementToBeGone(okButton);
-	}
-
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupPopup.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupPopup.java
deleted file mode 100644
index 27bbc475f1e01d908a3ded346a1ad28e1d52fd49..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupPopup.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-import java.util.List;
-
-public class ServiceGroupPopup extends PageComponent {
-	public AccordionSection ownersPanel;
-	public AccordionSection domainsPanel;
-	@FindBy(css = "#owner_expansion_panel_id")
-	private WebElement ownersPanelContainer;
-	@FindBy(css = "#domain_expansion_panel_id")
-	private WebElement domainsPanelContainer;
-	@FindBy(css = "mat-dialog-actions button:nth-child(1)")
-	private WebElement okButton;
-	@FindBy(css = "mat-dialog-actions button:nth-child(2)")
-	private WebElement cancelButton;
-	@FindBy(css = "#participantIdentifier_id")
-	private WebElement participantIdentifierInput;
-	@FindBy(css = "#participantScheme_id")
-	private WebElement participantSchemeInput;
-	@FindBy(css = "#extensionTextArea")
-	private WebElement extensionTextArea;
-	@FindBy(css = "mat-card-content > mat-toolbar > mat-toolbar-row > button:nth-child(1)")
-	private WebElement clearExtensionButton;
-	@FindBy(css = "mat-card-content > mat-toolbar > mat-toolbar-row > button:nth-child(2)")
-	private WebElement extensionWizardButton;
-	@FindBy(css = "mat-card-content > mat-toolbar > mat-toolbar-row > button:nth-child(3)")
-	private WebElement validateExtensionButton;
-	@FindBy(css = "mat-card-content > div.ng-star-inserted")
-	private WebElement errorContainer;
-
-	public ServiceGroupPopup(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-
-		try {
-			ownersPanel = new AccordionSection(driver, ownersPanelContainer);
-		} catch (Exception e) {
-			log.error("Owners panel is not present");
-		}
-		domainsPanel = new AccordionSection(driver, domainsPanelContainer);
-		waitForElementToBeVisible(okButton);
-	}
-
-	public boolean isOKButtonPresent() {
-		log.info("is ok button visible");
-		return isVisible(okButton);
-	}
-
-	public boolean isCancelButtonPresent() {
-		log.info("is cancel button visible");
-		return isVisible(cancelButton);
-	}
-
-	public boolean isOKButtonEnable() {
-		log.info("is ok button visible");
-		return isEnabled(okButton);
-	}
-
-	public boolean isCancelButtonEnable() {
-		log.info("is cancel button visible");
-		return isEnabled(cancelButton);
-	}
-
-	public boolean isExtensionAreaEditable() {
-		log.info("is Extension Area Editable");
-		return isEnabled(extensionTextArea);
-	}
-
-	public boolean isParticipantIdentifierInputEnabled() {
-		log.info("is Participant Identifier Input Enabled");
-		return isEnabled(participantIdentifierInput);
-	}
-
-	public boolean isParticipantSchemeInputEnabled() {
-		log.info("is Participant Scheme Input Enabled");
-		return isEnabled(participantSchemeInput);
-	}
-
-	public boolean isOwnersPanelEnabled() {
-		log.info("check owner panel is enabled");
-		return ownersPanel.optionsEnabled();
-	}
-
-	public boolean isOwnersPanelPresent() {
-		log.info("check owner panel is present");
-		return null == ownersPanel;
-	}
-
-	public boolean isDomainsPanelEnabled() {
-		log.info("check domains panel is enabled");
-		return domainsPanel.optionsEnabled();
-	}
-
-	public void clickOK() {
-		log.info("click ok..");
-		waitForElementToBeClickable(okButton).click();
-		waitForElementToBeGone(okButton);
-	}
-
-	public void clickClear() {
-		log.info("click clear..");
-		waitForElementToBeClickable(clearExtensionButton).click();
-		waitForXMillis(100);
-	}
-
-	public void clickCancel() {
-		log.info("click cancel..");
-		waitForElementToBeClickable(cancelButton).click();
-		waitForElementToBeGone(cancelButton);
-	}
-
-	public void fillForm(String identifier, String scheme, List<String> owners, List<String> domains, String extension) {
-		log.info("filling form..");
-
-		waitForElementToBeVisible(participantIdentifierInput);
-
-		clearAndFillInput(participantIdentifierInput, identifier);
-		clearAndFillInput(participantSchemeInput, scheme);
-
-		for (String owner : owners) {
-			ownersPanel.selectOptionWithText(owner);
-		}
-
-		domainsPanel.expandSection();
-
-		for (String domain : domains) {
-			domainsPanel.selectOptionWithText(domain);
-		}
-
-		clearAndFillInput(extensionTextArea, extension);
-
-	}
-
-	public String getParticipantIdentifierValue() {
-		return waitForElementToBeVisible(participantIdentifierInput).getAttribute("value").trim();
-	}
-
-	public String getParticipantSchemeValue() {
-		return participantSchemeInput.getAttribute("value").trim();
-	}
-
-	public String getErrorMessage() {
-		return errorContainer.getText().trim();
-	}
-
-	public String getExtensionAreaContent() {
-		log.info("getting Extension Area Content");
-
-		waitForElementToBeVisible(extensionTextArea);
-		waitForXMillis(500);
-		return extensionTextArea.getAttribute("value").trim();
-	}
-
-	public void enterDataInExtensionTextArea(String text) {
-		waitForElementToBeVisible(extensionTextArea).clear();
-		extensionTextArea.sendKeys(text);
-		waitForXMillis(1000);
-	}
-
-	public void fillParticipantIdentifier(String participantIdentifier) {
-		clearAndFillInput(participantIdentifierInput, participantIdentifier);
-	}
-
-	public void fillParticipantScheme(String participantScheme) {
-		clearAndFillInput(participantSchemeInput, participantScheme);
-	}
-
-	public void chooseFirstOwner() {
-		if (!ownersPanel.isExpanded()) {
-			ownersPanel.expandSection();
-		}
-		ownersPanel.selectOptionWithIndex(0);
-
-	}
-
-	public void chooseFirstDomain() {
-		if (!domainsPanel.isExpanded()) {
-			domainsPanel.expandSection();
-		}
-		domainsPanel.selectOptionWithIndex(0);
-	}
-
-	public void fillExtensionArea(String extension) {
-		clearAndFillInput(extensionTextArea, extension);
-	}
-
-	public void generateRndExtension() {
-		extensionWizardButton.click();
-		new SGExtensionWizzard(driver).fillWithRndStrings();
-
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupRowE.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupRowE.java
deleted file mode 100644
index 7d430e7314fb9dbc166db41a7787c4d080285036..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceGroupRowE.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import pages.service_groups.ServiceGroupRow;
-
-public class ServiceGroupRowE extends ServiceGroupRow {
-	public ServiceGroupRowE(WebDriver driver, WebElement container) {
-		super(driver, container);
-	}
-
-	@FindBy(css = "datatable-body-cell:nth-child(7) > div > div > button:nth-child(1)")
-	WebElement addMetadataButton;
-
-	@FindBy(css = "datatable-body-cell:nth-child(7) > div > div > button:nth-child(2)")
-	WebElement editServiceGroup;
-
-	@FindBy(css = "datatable-body-cell:nth-child(7) > div > div > button:nth-child(3)")
-	WebElement deleteServiceGroup;
-
-	@Override
-	public Integer getMetadataSize() {
-		return Integer.valueOf(cells.get(1).getText().trim());
-	}
-
-	public Integer getOwnerSize() {
-		return Integer.valueOf(cells.get(2).getText().trim());
-	}
-
-	public ServiceMetadataPopup clickAddMetadata(){
-		waitForElementToBeClickable(addMetadataButton).click();
-
-		return new ServiceMetadataPopup(driver);
-	}
-
-	public ServiceGroupPopup clickEdit(){
-		waitForElementToBeClickable(editServiceGroup).click();
-		return new ServiceGroupPopup(driver);
-	}
-
-	public void clickDelete(){
-		waitForElementToBeClickable(deleteServiceGroup).click();
-	}
-
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java
deleted file mode 100644
index 7d1e051926f3000d5a02417fefc2522c6e62cf1d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.GenericSelect;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-public class ServiceMetadataPopup extends PageComponent {
-	@FindBy(css = "mat-dialog-actions > button:nth-child(1)")
-	private WebElement okButton;
-	@FindBy(css = "mat-dialog-actions > button:nth-child(2)")
-	private WebElement cancelButton;
-	@FindBy(css = "mat-card-content > mat-toolbar > mat-toolbar-row > button:nth-child(1)")
-	private WebElement clearButton;
-	@FindBy(css = "mat-card-content > mat-toolbar > mat-toolbar-row > button:nth-child(2)")
-	private WebElement generateXMLButton;
-	@FindBy(css = "mat-card-content > mat-toolbar > mat-toolbar-row > button:nth-child(4)")
-	private WebElement validateButton;
-	@FindBy(css = "#MetadataTextArea")
-	private WebElement metadataTextArea;
-	@FindBy(css = "#participanSchema_id")
-	private WebElement participantSchemaInput;
-	@FindBy(css = "#participantIdentifier_id")
-	private WebElement participantIdentifierInput;
-	@FindBy(css = "#documentScheme_id")
-	private WebElement documentSchemeInput;
-	@FindBy(css = "#documentIdentifier_id")
-	private WebElement documentIdentifierInput;
-	@FindBy(xpath = "//span[text() ='Metadata wizard']")
-	private WebElement metadataWizardBtn;
-	@FindBy(css = "mat-card-content > div > div.ng-star-inserted:nth-child(2)")
-	private WebElement xmlValidationMsg;
-	@FindBy(css = "mat-dialog-content #domain_id")
-	private WebElement domainSelectContainer;
-	private GenericSelect domainSelect;
-
-	public ServiceMetadataPopup(WebDriver driver) {
-		super(driver);
-
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-
-		waitForElementToBeVisible(domainSelectContainer);
-		domainSelect = new GenericSelect(driver, domainSelectContainer);
-	}
-
-	public EditPage clickOK() {
-		waitForElementToBeClickable(okButton);
-		okButton.click();
-		return new EditPage(driver);
-	}
-
-	public boolean isOKBtnEnabled() {
-		return okButton.isEnabled();
-	}
-
-	public void fillDocIdAndDocIdScheme(String docID, String docScheme) {
-		waitForElementToBeVisible(documentIdentifierInput);
-		clearAndFillInput(documentIdentifierInput, docID);
-		clearAndFillInput(documentSchemeInput, docScheme);
-
-	}
-
-	public String xmlFieldVALUE() {
-		log.info("value is " + metadataTextArea.getAttribute("value"));
-		return metadataTextArea.getAttribute("value");
-	}
-
-	public void fillForm(String domain, String docID, String docScheme) {
-		waitForElementToBeVisible(documentIdentifierInput);
-		domainSelect.selectWithIndex(0);
-
-		clearAndFillInput(documentIdentifierInput, docID);
-		clearAndFillInput(documentSchemeInput, docScheme);
-
-		generateXMLButton.click();
-
-	}
-
-	public String captureTextOfMetadataTextArea() {
-		return metadataTextArea.getText();
-	}
-
-	public void clickValidateBtn() {
-		waitForElementToBeClickable(validateButton).click();
-	}
-
-	public void clickGenerateXMLBtn() {
-		waitForElementToBeClickable(generateXMLButton).click();
-	}
-
-	public void clickClearBtn() {
-		waitForElementToBeClickable(clearButton).click();
-	}
-
-	public String getXMLValidationMessage() {
-		return xmlValidationMsg.getText();
-	}
-
-	public void addTextToMetadataTextArea(String generator) {
-		metadataTextArea.sendKeys(generator);
-
-	}
-
-	public String docIDFieldValue() {
-		return documentIdentifierInput.getAttribute("value");
-	}
-
-	public String docIDSchemeFieldValue() {
-		return documentSchemeInput.getAttribute("value");
-	}
-
-	public String getParticipantSchemeValue() {
-		waitForElementToBeVisible(participantSchemaInput);
-		return participantSchemaInput.getAttribute("value").trim();
-	}
-
-	public String getParticipantIdentifierValue() {
-		waitForElementToBeVisible(participantIdentifierInput);
-		return participantIdentifierInput.getAttribute("value").trim();
-	}
-
-	public String getDocumentIdentifierValue() {
-		waitForElementToBeVisible(documentIdentifierInput);
-		return documentIdentifierInput.getAttribute("value").trim();
-	}
-
-	public String getDocumentSchemeValue() {
-		waitForElementToBeVisible(documentSchemeInput);
-		return documentSchemeInput.getAttribute("value").trim();
-	}
-
-
-	public boolean isParticipantSchemeEnabled() {
-		return isEnabled(participantSchemaInput);
-	}
-
-	public boolean isParticipantIdentifierEnabled() {
-		return isEnabled(participantIdentifierInput);
-	}
-
-	public boolean isDocumentIdentifierEnabled() {
-		return isEnabled(documentIdentifierInput);
-	}
-
-	public ServiceMetadataWizardPopup clickMetadataWizard() {
-		waitForElementToBeClickable(metadataWizardBtn).click();
-		return new ServiceMetadataWizardPopup(driver);
-
-	}
-
-	public boolean isDocumentSchemeEnabled() {
-		return isEnabled(documentSchemeInput);
-	}
-
-
-	public String getListedDomain() {
-		return domainSelect.getSelectedValue().trim();
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java
deleted file mode 100644
index 96a1948476d2ccf21e06489991db895c28193fe0..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package pages.service_groups.edit;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.PageComponent;
-import utils.PROPERTIES;
-
-import java.io.File;
-
-public class ServiceMetadataWizardPopup extends PageComponent {
-	@FindBy(css = "#documentIdentifierScheme_id")
-	private WebElement docIdSchemeField;
-	@FindBy(css = "#processSchema_id")
-	private WebElement processSchemeField;
-	@FindBy(css = "service-metadata-wizard-dialog input#documentIdentifier_id")
-	private WebElement docIdField;
-	@FindBy(css = "#processidentifier_id")
-	private WebElement processIdField;
-	@FindBy(css = "#endpointUrl_id")
-	private WebElement endpointUrl;
-	@FindBy(css = "#transportProfiler_id")
-	private WebElement transportProfileField;
-	@FindBy(css = "service-metadata-wizard-dialog > mat-dialog-actions > button[type='button']:nth-child(1)")
-	private WebElement okButton;
-	@FindBy(css = "service-metadata-wizard-dialog > mat-dialog-actions > button[type='button']:nth-child(2)")
-	private WebElement cancelButton;
-	@FindBy(css = "input#certificate-file-upload")
-	private WebElement uploadCertificateBtn;
-	@FindBy(css = "#metadatacertificate_id")
-	private WebElement certificateDescriptionBox;
-
-
-	public ServiceMetadataWizardPopup(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-	}
-
-	public String docIDFieldValue() {
-		return docIdField.getAttribute("value");
-	}
-
-	public String docIDSchemeFieldValue() {
-		return docIdSchemeField.getAttribute("value");
-	}
-
-	public String transportProfileFieldContent() {
-		return transportProfileField.getAttribute("value");
-	}
-
-
-	public void clickUploadCertificate() {
-		waitForElementToBeVisible(uploadCertificateBtn);
-		uploadCertificateBtn.click();
-	}
-
-	public void fillCerificateBox(String generator) {
-		certificateDescriptionBox.sendKeys(generator);
-	}
-
-	public void uploadCertificate(String relativePath) {
-		waitForElementToBeVisible(uploadCertificateBtn);
-		uploadCertificateBtn.click();
-		String path = new File(relativePath).getAbsolutePath();
-		uploadCertificateBtn.sendKeys(path);
-	}
-
-	public boolean isEnabledOkBtn() {
-		waitForElementToBeEnabled(okButton);
-		return okButton.isEnabled();
-	}
-
-	public ServiceMetadataPopup clickOK() {
-		waitForElementToBeVisible(okButton);
-		okButton.click();
-		return new ServiceMetadataPopup(driver);
-	}
-
-	public void fillForm(String docID, String docScheme, String processID, String processScheme, String transportProfile, String url) {
-		waitForElementToBeVisible(docIdField);
-
-		clearAndFillInput(docIdField, docID);
-		clearAndFillInput(docIdSchemeField, docScheme);
-		clearAndFillInput(processIdField, processID);
-		clearAndFillInput(processSchemeField, processScheme);
-		clearAndFillInput(transportProfileField, transportProfile);
-		clearAndFillInput(endpointUrl, url);
-
-
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/search/SearchPage.java b/smp-ui-tests/src/main/java/pages/service_groups/search/SearchPage.java
deleted file mode 100644
index 56e4a92fa3a457dd304bafff1195d5262165d33a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/search/SearchPage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package pages.service_groups.search;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.baseComponents.SMPPage;
-import pages.service_groups.ServiceGroupGrid;
-import pages.service_groups.FilterArea;
-import utils.PROPERTIES;
-
-public class SearchPage extends SMPPage {
-
-	public SearchPage(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements( new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-
-		this.pageHeader.waitForTitleToBe("Search");
-
-	}
-
-	public FilterArea filters = new FilterArea(driver);
-
-	@FindBy(id = "searchTable")
-	WebElement searchGridContainer;
-
-
-	public boolean isLoaded() {
-		log.info("checking if search page is loaded");
-		if(!filters.isLoaded()){ return false;}
-		return getServiceGroupGrid().isLoaded();
-	}
-
-	public ServiceGroupGrid
-		getServiceGroupGrid() {
-		return new ServiceGroupGrid(driver, searchGridContainer);
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ParticipantIdentifier.java b/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ParticipantIdentifier.java
deleted file mode 100644
index b0d3902d01a607dd1f8caa93e38264c9dad57016..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ParticipantIdentifier.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package pages.service_groups.search.pojo;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
-
-@XStreamAlias("ParticipantIdentifier")
-@XStreamConverter(value= ToAttributedValueConverter.class, strings={"participantIdentifier"})
-public class ParticipantIdentifier {
-
-
-	String scheme;
-
-
-	String participantIdentifier;
-
-	public String getScheme() {
-		return scheme;
-	}
-
-	public void setScheme(String scheme) {
-		this.scheme = scheme;
-	}
-
-	public String getParticipantIdentifier() {
-		return participantIdentifier;
-	}
-
-	public void setParticipantIdentifier(String participantIdentifier) {
-		this.participantIdentifier = participantIdentifier;
-	}
-
-	@Override
-	public String toString() {
-		return "ParticipantIdentifier{" +
-				"scheme='" + scheme + '\'' +
-				", participantIdentifier='" + participantIdentifier + '\'' +
-				'}';
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ServiceGroup.java b/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ServiceGroup.java
deleted file mode 100644
index 8e8454b44871ee9690482ddd61d116d9d824a9c2..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ServiceGroup.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package pages.service_groups.search.pojo;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import java.util.List;
-
-@XStreamAlias("ServiceGroup")
-public class ServiceGroup {
-
-	@XStreamAlias("ParticipantIdentifier")
-	ParticipantIdentifier participantIdentifier;
-
-	@XStreamAlias("ServiceMetadataReferenceCollection")
-	List<ServiceMetadataReference> serviceMetadataReferenceCollection;
-
-	public ParticipantIdentifier getParticipantIdentifier() {
-		return participantIdentifier;
-	}
-
-	public void setParticipantIdentifier(ParticipantIdentifier participantIdentifier) {
-		this.participantIdentifier = participantIdentifier;
-	}
-
-	public List<ServiceMetadataReference> getServiceMetadataReferenceCollection() {
-		return serviceMetadataReferenceCollection;
-	}
-
-	public void setServiceMetadataReferenceCollection(List<ServiceMetadataReference> serviceMetadataReferenceCollection) {
-		this.serviceMetadataReferenceCollection = serviceMetadataReferenceCollection;
-	}
-
-	@Override
-	public String toString() {
-		return "ServiceGroup{" +
-				"participantIdentifier=" + participantIdentifier +
-				", serviceMetadataReferenceCollection=" + serviceMetadataReferenceCollection +
-				'}';
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ServiceMetadataReference.java b/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ServiceMetadataReference.java
deleted file mode 100644
index d911c0aae9c2ad0b2220233304bb52aa9ec0fdc3..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/service_groups/search/pojo/ServiceMetadataReference.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pages.service_groups.search.pojo;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("ServiceMetadataReference")
-public class ServiceMetadataReference {
-
-	@XStreamAsAttribute
-	String href;
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	@Override
-	public String toString() {
-		return "ServiceMetadataReference{" +
-				"href='" + href + '\'' +
-				'}';
-	}
-}
diff --git a/smp-ui-tests/src/main/java/pages/users/UserPopup.java b/smp-ui-tests/src/main/java/pages/users/UserPopup.java
deleted file mode 100644
index af40d3f1e2d0a577628ef3272c0fb1c634f53aff..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/users/UserPopup.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package pages.users;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.GenericSelect;
-import pages.components.baseComponents.PageComponent;
-
-public class UserPopup extends PageComponent {
-	public GenericSelect rolesSelect;
-	@FindBy(id = "userDetailsToggle_id")
-	WebElement userDetailsToggle;
-
-	@FindBy(css = "#active_id > label > div > div")
-	WebElement activeToggle;
-
-	@FindBy(id = "username_id")
-	WebElement userNameInput;
-
-	@FindBy(id = "emailAddress_id")
-	WebElement emailInput;
-
-	@FindBy(id = "np_id")
-	WebElement newPasswordInput;
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@FindBy(id = "cnp_id")
-	WebElement confirmationInput;
-
-	@FindBy(css = "input#cp_id")
-	WebElement adminPassInput;
-
-	@FindBy(css = "mat-form-field.username> div > div.mat-form-field-flex > div > div")
-	WebElement usernameValidationError;
-
-	@FindBy(css = "smp-password-change-dialog .password-panel mat-form-field:nth-child(2) .mat-form-field-subscript-wrapper mat-error")
-	WebElement passValidationError;
-
-	@FindBy(css = "mat-form-field.password-confirmation > div > div.mat-form-field-flex > div > div")
-	WebElement passConfirmationValidationError;
-
-	@FindBy(css = ".ng-trigger.ng-trigger-transitionMessages.ng-star-inserted > mat-error")
-	WebElement passMatchValidationError;
-
-	@FindBy(css = "mat-dialog-actions button:nth-child(1)")
-	WebElement okBtn;
-
-	@FindBy(css = "mat-dialog-actions button:nth-child(2)")
-	WebElement cancelBtn;
-
-	@FindBy(css = "#changePassword_id")
-	WebElement changePassword;
-
-	@FindBy(css = "smp-password-change-dialog mat-dialog-actions button:nth-child(1)")
-	WebElement changedPassword;
-
-	@FindBy(css = "#closebuttondialog_id")
-	WebElement passChangedClose;
-
-	@FindBy(css = "smp-password-change-dialog mat-dialog-actions button:nth-child(2)")
-	WebElement passwordDialogClose;
-
-	@FindBy(css = "#role_id")
-	WebElement rolesSelectContainer;
-
-	@FindBy(xpath = "//span[text()='Regenerate access token']")
-	WebElement regenarateAccessTokenBtn;
-
-	@FindBy(css = "label > button.mat-focus-indicator.mat-flat-button.mat-button-base.mat-primary")
-	WebElement importBtn;
-
-	@FindBy(xpath = "//span[text()='Show details']")
-	WebElement showDetailsBtn;
-
-	@FindBy(xpath = "//span[text()='Clear']")
-	WebElement clearBtn;
-
-	@FindBy(css = ".has-error.ng-star-inserted")
-	WebElement emailValidationError;
-
-
-	public UserPopup(WebDriver driver) {
-		super(driver);
-		PageFactory.initElements(driver, this);
-		rolesSelect = new GenericSelect(driver, rolesSelectContainer);
-	}
-
-	public boolean isAdminPasswordInputEnable() {
-		boolean bool = adminPassInput.isEnabled();
-		return bool;
-	}
-
-	public boolean isNewPasswordInputEnable() {
-		boolean bool = newPasswordInput.isEnabled();
-		return bool;
-	}
-
-	public boolean isConfirmPasswordInputEnable() {
-		boolean bool = confirmationInput.isEnabled();
-		return bool;
-	}
-
-
-	public boolean isOKButtonActive() {
-		return isEnabled(okBtn);
-	}
-
-	public boolean isChangedPasswordActive() {
-		return isEnabled(passChangedClose);
-	}
-
-	public boolean isChangePasswordButtonActive() {
-		return isEnabled(changedPassword);
-	}
-
-	public boolean isCancelButtonActive() {
-		return isEnabled(cancelBtn);
-	}
-
-	public void fillData(String user, String email, String role, String password, String confirmation) {
-		clearAndFillInput(userNameInput, user);
-		clearAndFillInput(emailInput, email);
-		clearAndFillInput(newPasswordInput, password);
-		clearAndFillInput(confirmationInput, confirmation);
-
-		GenericSelect rolesSelect = new GenericSelect(driver, rolesSelectContainer);
-		rolesSelect.selectOptionByText(role);
-
-	}
-
-	public void clickOK() {
-		log.info("click OK");
-		waitForElementToBeClickable(okBtn);
-		okBtn.click();
-		waitForElementToBeGone(okBtn);
-	}
-
-	public void clickCancel() {
-		log.info("click cancel");
-		waitForElementToBeClickable(cancelBtn);
-		cancelBtn.click();
-		waitForElementToBeGone(cancelBtn);
-	}
-
-
-	public void clickUserDetailsToggle() {
-		log.info("details toggle");
-		waitForElementToBeClickable(userDetailsToggle).click();
-		waitForElementToBeEnabled(userNameInput);
-	}
-
-	public void fillDetailsForm(String username, String email) {
-		clearAndFillInput(userNameInput, username);
-		clearAndFillInput(emailInput, email);
-	}
-
-	public void clickSetOrChangePassword() {
-		log.info("click change password");
-		waitForElementToBeClickable(changePassword);
-		waitForXMillis(500);
-		changePassword.click();
-		waitForXMillis(500);
-	}
-
-	public void clickCloseAfterChangedPass() {
-		log.info("click close after change password");
-		try {
-			Thread.sleep(10000);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		waitForElementToBeClickable(passChangedClose);
-		log.info("ab");
-		passChangedClose.click();
-		log.info("bd");
-		waitForElementToBeGone(passChangedClose);
-		log.info("cd");
-	}
-
-	public ConfirmationDialog clickChangedPassword() {
-		log.info("click changed password");
-		waitForElementToBeClickable(changedPassword);
-		waitForXMillis(500);
-		changedPassword.click();
-		waitForElementToBeGone(changedPassword);
-		return new ConfirmationDialog(driver);
-	}
-
-	public boolean isPopupChangedPasswordEnabled() {
-		return changedPassword.isEnabled();
-	}
-
-	public void setOrChangePassword(String adminPass, String newPass, String confirmPass) {
-
-		clearAndFillInput(adminPassInput, adminPass);
-		clearAndFillInput(newPasswordInput, newPass);
-		clearAndFillInput(confirmationInput, confirmPass);
-	}
-
-	public void clickClosePasswordDialog() {
-		passwordDialogClose.click();
-		waitForElementToBeGone(passwordDialogClose);
-	}
-
-
-	public String getUsernameValidationError() {
-		try {
-			waitForElementToBeVisible(usernameValidationError);
-			return usernameValidationError.getText();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public String userEmailValidationGetErrMsg() {
-		try {
-			waitForElementToBeVisible(emailValidationError);
-			return emailValidationError.getText();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public String getPassValidationError() {
-		try {
-			waitForElementToBeVisible(passValidationError);
-			return passValidationError.getText();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public String getConfirmationPassValidationError() {
-
-		try {
-			waitForElementToBeVisible(passConfirmationValidationError);
-			return passConfirmationValidationError.getText();
-		} catch (Exception e) {
-		}
-		return null;
-	}
-
-	public boolean isDuplicateUserNameErrorMsgDisPlayed() {
-		try {
-			return driver.findElement(By.cssSelector("mat-form-field.username > div .has-error")).isDisplayed();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	public String getPassDontMatchValidationMsg() {
-		return passMatchValidationError.getText();
-	}
-
-	public boolean isUsernameFieldEnabled() {
-		return isEnabled(userNameInput);
-	}
-
-	public boolean isEmailFieldEnabled() {
-		return isEnabled(emailInput);
-	}
-
-	public boolean isRoleSelectFieldEnabled() {
-		return isEnabled(rolesSelectContainer);
-	}
-
-	public boolean isSetOrChangePassOptionBtnEnabled() {
-		return isEnabled(changePassword);
-	}
-
-	public boolean isRegenerateAccesstokenBtnEnabled() {
-		return isEnabled(regenarateAccessTokenBtn);
-	}
-
-	public boolean isImportButtonActive() {
-		return isEnabled(importBtn);
-	}
-
-	public boolean isShowDetailsButtonActive() {
-		return isEnabled(showDetailsBtn);
-	}
-
-	public boolean isClearButtonActive() {
-		return isEnabled(clearBtn);
-	}
-
-}
diff --git a/smp-ui-tests/src/main/java/pages/users/UserRowInfo.java b/smp-ui-tests/src/main/java/pages/users/UserRowInfo.java
deleted file mode 100644
index 962d388ee690430e1a628ccffb57bb2ccb484088..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/users/UserRowInfo.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package pages.users;
-
-public class UserRowInfo {
-
-    private String username;
-    private String role;
-    private String certificate;
-
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getRole() {
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    public String getCertificate() {
-        return certificate;
-    }
-
-    public void setCertificate(String certificate) {
-        this.certificate = certificate;
-    }
-}
diff --git a/smp-ui-tests/src/main/java/pages/users/UsersGrid.java b/smp-ui-tests/src/main/java/pages/users/UsersGrid.java
deleted file mode 100644
index 6ed41935a742f27d49d01957113f9a3441ebe2c5..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/users/UsersGrid.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package pages.users;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import pages.components.baseComponents.PaginationControls;
-import pages.components.grid.BasicGrid;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class UsersGrid extends BasicGrid {
-	public UsersGrid(WebDriver driver, WebElement container) {
-		super(driver, container);
-	}
-
-	public List<UserRowInfo> getRows() {
-		List<UserRowInfo> rowInfos = new ArrayList<>();
-
-		for (WebElement gridRow : gridRows) {
-			List<WebElement> cells = gridRow.findElements(By.tagName("datatable-body-cell"));
-			UserRowInfo rowInfo = new UserRowInfo();
-			rowInfo.setUsername(cells.get(0).getText().trim());
-			rowInfo.setCertificate(cells.get(1).getText().trim());
-			rowInfo.setRole(cells.get(2).getText().trim());
-			rowInfos.add(rowInfo);
-		}
-		return rowInfos;
-	}
-
-	public boolean isUserListed(String username) {
-		PaginationControls pagination = new PaginationControls(driver);
-		pagination.skipToFirstPage();
-		List<UserRowInfo> rows;
-		int count = 0;
-		do {
-			if (count != 0) {
-				pagination.goToNextPage();
-			}
-			rows =getRows();
-			for (UserRowInfo row : rows) {
-				if (row.getUsername().equalsIgnoreCase(username)) {
-					return true;
-				}
-			}
-			count++;
-		}
-		while (pagination.hasNextPage());
-		return false;
-	}
-
-	public int scrollToUser(String username) {
-		PaginationControls pagination = new PaginationControls(driver);
-		pagination.skipToFirstPage();
-		List<UserRowInfo> rows;
-		int count = 0;
-		do {
-			if(count!=0){
-				pagination.goToNextPage();
-			}
-			rows = getRows();
-			for (int i = 0; i < rows.size(); i++) {
-				if (rows.get(i).getUsername().equalsIgnoreCase(username)) {
-					return i;
-				}
-			}
-			count++;
-		} while (pagination.hasNextPage());
-		return -1;
-	}
-
-	public int scrollToUserWithRole(String role) {
-		PaginationControls pagination = new PaginationControls(driver);
-		pagination.skipToFirstPage();
-		List<UserRowInfo> rows;
-		int count = 0;
-
-		do {
-			if(count!=0){
-				pagination.goToNextPage();
-			}
-			rows = getRows();
-			for (int i = 0; i < rows.size(); i++) {
-				if (rows.get(i).getRole().equalsIgnoreCase(role)) {
-					return i;
-				}
-			}
-			count++;
-
-		    } while (pagination.hasNextPage());
-		      return -1;
-	     }
-	public boolean userHasCertificate(int index){
-		List<UserRowInfo> rows = getRows();
-		int i=index;
-		return rows.get(i).getCertificate().isEmpty();
-	}
-	}
-
-
-
diff --git a/smp-ui-tests/src/main/java/pages/users/UsersPage.java b/smp-ui-tests/src/main/java/pages/users/UsersPage.java
deleted file mode 100644
index 23632189c41d5c7cf41694bf221de9bdb916d6ee..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/pages/users/UsersPage.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package pages.users;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.PageFactory;
-import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.PaginationControls;
-import pages.components.baseComponents.SMPPage;
-import utils.PROPERTIES;
-
-public class UsersPage extends SMPPage {
-    public PaginationControls pagination = new PaginationControls(driver);
-    @FindBy(id = "searchTable")
-    private WebElement userTableContainer;
-    @FindBy(id = "cancelButton")
-    private WebElement cancelBtn;
-    @FindBy(id = "saveButton")
-    private WebElement saveBtn;
-    @FindBy(id = "newButton")
-    private WebElement newBtn;
-    @FindBy(id = "editButton")
-    private WebElement editBtn;
-    @FindBy(id = "deleteButton")
-    private WebElement deleteBtn;
-    @FindBy(xpath = "//span[text()=' Edit truststore']")
-    private WebElement editTruststore;
-
-    public UsersPage(WebDriver driver) {
-        super(driver);
-        this.pageHeader.waitForTitleToBe("Users");
-        PageFactory.initElements(new AjaxElementLocatorFactory(driver, PROPERTIES.TIMEOUT), this);
-    }
-
-    public boolean isLoaded() {
-        log.info("checking Users page is loaded");
-
-        return isVisible(cancelBtn)
-                && isVisible(saveBtn)
-                && isVisible(newBtn)
-                && isEnabled(newBtn)
-                && isVisible(editBtn)
-                && isVisible(deleteBtn);
-    }
-
-    public boolean isCancelButtonEnabled() {
-        log.info("cancel button");
-        return isEnabled(cancelBtn);
-    }
-
-    public boolean isSaveButtonEnabled() {
-        log.info("save button");
-        return isEnabled(saveBtn);
-    }
-
-    public boolean isEditButtonEnabled() {
-        log.info("save button");
-        return isEnabled(editBtn);
-    }
-
-    public boolean isDeleteButtonEnabled() {
-        waitForXMillis(200);
-        log.info("delete button");
-        return isEnabled(deleteBtn);
-    }
-
-    public ConfirmationDialog clickCancel() {
-        log.info("click cancel button");
-        waitForElementToBeClickable(cancelBtn).click();
-        return new ConfirmationDialog(driver);
-    }
-
-    public ConfirmationDialog clickSave() {
-        log.info("click save button");
-        waitForElementToBeClickable(saveBtn).click();
-        return new ConfirmationDialog(driver);
-    }
-
-    public void clickDelete() {
-        log.info("click delete button");
-        waitForElementToBeClickable(deleteBtn).click();
-        waitForRowsToLoad();
-    }
-
-    public UserPopup clickNew() {
-        log.info("click new button");
-        waitForElementToBeClickable(newBtn).click();
-        return new UserPopup(driver);
-    }
-
-    public UserPopup clickEdit() {
-        log.info("click edit button");
-        waitForElementToBeClickable(editBtn).click();
-        return new UserPopup(driver);
-    }
-
-
-    public UsersGrid grid() {
-        return new UsersGrid(driver, userTableContainer);
-    }
-
-
-    public void createUser() {
-        log.info("create user");
-
-        waitForElementToBeClickable(newBtn).click();
-
-        UserPopup popup = new UserPopup(driver);
-        popup.clickOK();
-
-    }
-
-    public boolean isNewButtonEnabled() {
-        try {
-            return isEnabled(newBtn);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public boolean isEditTruststoreButtonEnabled() {
-        try {
-            return isEnabled(editTruststore);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-
-    }
-
-    public boolean isDeleteButtonVisible() {
-        try {
-            return isVisible(deleteBtn);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public boolean isEditButtonVisible() {
-        try {
-            return isVisible(editBtn);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-
-    public boolean isCancelButtonVisible() {
-
-        return isVisible(cancelBtn);
-    }
-
-    public boolean isSaveButtonVisible() {
-
-        return isVisible(saveBtn);
-    }
-
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/DriverManager.java b/smp-ui-tests/src/main/java/utils/DriverManager.java
deleted file mode 100644
index 3a2fdade724d236982b7ad2ed8971777786ceae2..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/DriverManager.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package utils;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.chrome.ChromeDriver;
-import org.openqa.selenium.chrome.ChromeOptions;
-
-import java.util.concurrent.TimeUnit;
-
-public class DriverManager {
-
-
-	public static WebDriver getDriver() {
-
-		ChromeOptions options = new ChromeOptions();
-		options.setHeadless(Boolean.valueOf(PROPERTIES.HEADLESS));
-		options.addArguments("--disable-dev-shm-usage"); // overcome limited resource problems
-		options.addArguments("--no-sandbox"); // Bypass OS security model
-
-		options.addArguments("--disable-dev-shm-usage"); // overcome limited resource problems
-		options.addArguments("--window-size=1920,1080");
-
-
-		WebDriver driver = new ChromeDriver(options);
-		driver.manage().timeouts().implicitlyWait(1, TimeUnit.SECONDS);
-		driver.manage().window().maximize();
-
-		return driver;
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/Generator.java b/smp-ui-tests/src/main/java/utils/Generator.java
deleted file mode 100644
index 69b3a7a2b9af31d2ef1f82c1bfcfa084f097a4a6..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/Generator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package utils;
-
-public class Generator {
-
-	@SuppressWarnings("SpellCheckingInspection")
-	private static final String ALPHA_NUMERIC_STRING = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-	private static final String ALPHA_STRING = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-
-	public static String randomAlphaNumeric(int count) {
-		return randomAlpha(count);
-	}
-
-	public static String randomAlpha(int count) {
-		StringBuilder builder = new StringBuilder();
-		while (count-- != 0) {
-			int character = (int) (Math.random() * ALPHA_STRING.length());
-			builder.append(ALPHA_STRING.charAt(character));
-		}
-		return builder.toString();
-	}
-
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/PROPERTIES.java b/smp-ui-tests/src/main/java/utils/PROPERTIES.java
deleted file mode 100644
index 40690a6aba5be9942cb05a72bced99f0f2a8eb57..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/PROPERTIES.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package utils;
-
-@SuppressWarnings("SpellCheckingInspection")
-public class PROPERTIES {
-
-	public static final String UI_BASE_URL = System.getProperty("UI_BASE_URL");
-	public static final int SHORT_UI_TIMEOUT = 5;
-	public static final int TIMEOUT = Integer.valueOf(System.getProperty("SHORT_TIMEOUT"));
-
-	public static final String HEADLESS = "true";
-	public static final String REPORTS_FOLDER = System.getProperty("reports.folder");
-	public static final String TESTDATAFILE = System.getProperty("data.folder") + System.getProperty("testdata.file");
-
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/TestDataProvider.java b/smp-ui-tests/src/main/java/utils/TestDataProvider.java
deleted file mode 100644
index 71a232cab45887f8bb2bbe8882b66471599ff2ce..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/TestDataProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package utils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Iterator;
-
-public class TestDataProvider {
-
-    private JSONObject testData = null;
-
-
-    public TestDataProvider(){
-
-        String content = null;
-        try {
-            content = new String(Files.readAllBytes(Paths.get(PROPERTIES.TESTDATAFILE)));
-         	testData = new JSONObject(content);
-        } catch (Exception e) {
-           throw new RuntimeException("Error reading test data file: " + PROPERTIES.TESTDATAFILE);
-        }
-    }
-
-    public HashMap<String, String> getUserWithRole(String key){
-        HashMap<String, String> toReturn = new HashMap<>();
-
-		try {
-			JSONObject user = null;
-			user = testData.getJSONObject("loginUsers").getJSONObject(key);
-
-			Iterator<String> keysItr = user.keys();
-			while(keysItr.hasNext()) {
-				String usrKey = keysItr.next();
-				toReturn.put(usrKey, user.getString(usrKey));
-			}
-		} catch (JSONException e) {	}
-
-		return toReturn;
-    }
-
-	public String getDefaultTestPass(){
-		try {
-			return testData.getString("passwordForTestUsers");
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-		return "";
-	}
-
-
-
-
-
-
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java b/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
deleted file mode 100644
index f34c534e769ccc0105f57232800fe1c5f9ee8c58..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/enums/SMPMessages.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package utils.enums;
-
-public class SMPMessages {
-
-	public static final String MSG_1 = "Login failed; Invalid userID or password";
-	public static final String MSG_2 = "Too many invalid attempts to log in. Access has been temporarily\n" +
-			"suspended. Please try again later with the right credentials.";
-	public static final String MSG_3 = "To abandon all changes performed since last save, click on the \"Cancel\" button.\n" +
-			"Click on the \"Ok\" button keep your changes and come back to the current\n" +
-			"window unchanged.";
-	public static final String MSG_4 = "Please confirm by clicking on the \"Save\" button that you want to save all changes.\n" +
-			"If you don't want to save these changes now, please click on the \"Don't\n" +
-			"save now\" button";
-	public static final String MSG_5 = "To delete the current item(s) click on the \"Ok\" button.\n" +
-			"Click on the \"Cancel\" button to keep this item and come back to the\n" +
-			"current window unchanged";
-	public static final String MSG_6 = "The system detected a concurrent access.\n" +
-			"Your changes are irremediably lost, and the data were reverted to what\n" +
-			"the concurrent user saved before you.";
-	public static final String MSG_7 = "Component ${COMPONENT} is not accessible. Administration console is\n" +
-			"disabled.";
-	public static final String MSG_8 = "You are about to leave the edition of the current ${OBJECT_TYPE} which\n" +
-			"modifications were not saved yet.\n" +
-			"Click on \"Abandon\" to abandon your changes.\n" +
-			"Click \"Keep\" to stay on the current screen and keep your changes without\n" +
-			"saving them now" +
-			"Click \"Save\" to save your changes and move to the selected screen.";
-	public static final String MSG_9 = "The selection criteria you provided are too restrictive, no result matches\n" +
-			"these criteria. Please enter less selective criteria to obtain some results";
-	public static final String MSG_10 = "A value must be provided for the plugin and at least for one of the other\n" +
-			"column for the filter to be applicable.";
-	public static final String MSG_11 = "You are about to delete ServiceGroup: ${ServiceGroup} and its ServiceMetadata.\n" +
-			"Click on \"Delete\" to confirm the deletion.\n" +
-			"Click on \"Keep\" to keep the ServiceMetadata.";
-	public static final String MSG_12 = "You are about to delete ServiceMetadata: ${ServiceMetadata}.\n" +
-			"Click on \"Delete\" to confirm the deletion.\n" +
-			"Click on \"Keep\" to keep the ServiceMetadata";
-	public static final String MSG_13 = "You are about to delete User: ${User}.\n" +
-			"Click on \"Delete\" to confirm the deletion.\n" +
-			"Click on \"Keep\" to keep the user.\n";
-	public static final String MSG_14 = "You are about to create an SMP Domain: ${SMP_BDMSL_ID}. Action will\n" +
-			"register new user SMP user to SML for domain ${ BDMSL _DOMAIN}.\n" +
-			"Domain will be saved to SMP. Action is not recoverable.\n" +
-			"Click on \"Register\" to confirm the registration and saving.\n" +
-			"Click on \"Cancel\" to cancel the registration.";
-	@SuppressWarnings("SpellCheckingInspection")
-	public static final String MSG_15 = "You are about to delete an SMP Domain: ${SMP_DOMAIN_ID}. Action\n" +
-			"will unregister SMP domain user ${SMP_SML_ID}. from SML for domain\n" +
-			"${ BDMSL _DOMAIN}. Action is not recoverable.\n" +
-			"Click on \"Delete\" to confirm the deleting and unregistration of domain.\n" +
-			"Click on \"Keep\" to keep the domain.";
-	public static final String MSG_16 = "You are about to delete an X509 private key: ${Key }. Action is not recoverable.\n" +
-			"Click on \"Delete\" to confirm the deleting the key.\n" +
-			"Click on \"Keep\" to keep the key.";
-	public static final String MSG_17 = "You are about to delete Domain: ${SMP_DOMAIN_ID}.\n" +
-			"Click on \"Delete\" to confirm the deletion.\n" +
-			"Click on \"Keep\" to keep the domain.";
-	public static final String MSG_18 = "The operation 'update' completed successfully.";
-
-	public static final String USER_OWN_DELETE_ERR = "Delete validation error Could not delete logged user!";
-
-	public static final String MSG_19 = "Domain ${BDMSL_DOMAIN} is already registered with id ${DOMAIN_ID}";
-	public static final String MSG_20 = "All changes were aborted and data restored into the present window";
-	public static final String MSG_21 = "Unable to login. SMP is not running.";
-	public static final String MSG_22 = "The user is suspended. Please try again later or contact your administrator.";
-	public static final String MSG_23 = "Configuration error: Subject must have less than 256 character!";
-
-
-	public static final String USERNAME_VALIDATION_MESSAGE = "Username is case insensitive and can only contain alphanumeric characters (letters a-zA-Z, numbers 0-9) and must have from 4 to 32 characters!";
-	public static final String PASS_POLICY_MESSAGE = "Minimum length: 16 characters;Maximum length: 32 characters;At least one letter in lowercase;At least one letter in uppercase;At least one digit;At least one special character";
-	public static final String PASS_NO_MATCH_MESSAGE = "Passwords do not match";
-	public static final String PASS_NO_EMPTY_MESSAGE = "You should type a password";
-
-	public static final String KEYSTORE_IMPORTED_MSG = "Keystore %s imported!";
-	public static final String KEYSTORE_DELETION_MSG = "Certificate %s deleted!";
-	public static final String SMLSMPID_VALIDATION_MESSAGE = "SML SMP ID should be up to 63 characters long, should only contain alphanumeric and hyphen characters, should not start with a digit nor a hyphen and should not end with a hyphen.";
-	public static final String USER_EMAIL_VALIDATION_MESSAGE = "Email is invalid!";
-	public static final String DOMAINCODE_VALIDATION_MESSAGE = "Domain code must contain only chars and numbers and must be less than 63 chars long.";
-	public static final String VALID_XML_MESSAGE = "Servicemetadata is valid!";
-	public static final String INVALID_XML_MESSAGE1 = "SAXParseException: XML document structures must start and end within the same entity.";
-	public static final String INVALID_XML_MESSAGE2 = "SAXParseException: Content is not allowed in prolog.";
-	public static final String INVALID_XML_MESSAGE3 = "SAXParseException: Content is not allowed in trailing section.";
-	public static final String INVALID_XML_MESSAGE4 = "SAXParseException: cvc-complex-type.2.3: Element 'ServiceMetadata' cannot have character [children], because the type's content type is element-only.";
-	public static final String INVALID_XML_MESSAGE5 = "SAXParseException: The end-tag for element type \"ServiceMetadata\" must end with a '>' delimiter.";
-	public static final String INVALID_XML_MESSAGE6 = "SAXParseException: cvc-complex-type.2.3: Element 'Process' cannot have character [children], because the type's content type is element-only.";
-	public static final String EMPTY_XML_WARN_MESSAGE = "Service metadata xml must not be empty";
-	public static final String EMPTY_XML_MESSAGE = "Valid service metadata XML is required!";
-	public static final String INVALID_XML_MESSAGE7 = "SAXParseException: The markup in the document following the root element must be well-formed.";
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/rest/SMPPaths.java b/smp-ui-tests/src/main/java/utils/rest/SMPPaths.java
deleted file mode 100644
index 8d622544556016d7209b12a18cb305e2172dfd0a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/rest/SMPPaths.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package utils.rest;
-
-@SuppressWarnings("SpellCheckingInspection")
-public class SMPPaths {
-
-	public static final String REST_DOMAIN_LIST = "internal/rest/domain";
-	public static final String REST_POST_DOMAIN = "internal/rest/domain";
-	public static final String LOGIN_PATH = "public/rest/security/authentication";
-	public static final String USER_LIST = "internal/rest/user";
-	public static final String SERVICE_GROUP = "public/rest/service-group";
-	public static final String KEYSTORE = "internal/rest/keystore";
-	public static final String SYS_INFO = "public/rest/application/info";
-
-}
diff --git a/smp-ui-tests/src/main/java/utils/rest/SMPRestClient.java b/smp-ui-tests/src/main/java/utils/rest/SMPRestClient.java
deleted file mode 100644
index a3bd15e287f1d4ba2e6694160cfb8fff7fa69a23..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/java/utils/rest/SMPRestClient.java
+++ /dev/null
@@ -1,504 +0,0 @@
-package utils.rest;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.StaxDriver;
-import org.apache.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import pages.service_groups.search.pojo.ServiceGroup;
-import utils.Generator;
-import utils.PROPERTIES;
-import utils.TestDataProvider;
-
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.NewCookie;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SMPRestClient {
-
-	protected static Logger log = Logger.getLogger(SMPRestClient.class);
-	private static Client client = Client.create();
-	private static WebResource resource = client.resource(PROPERTIES.UI_BASE_URL);
-
-	public static ServiceGroup getServiceGroup(String url) {
-//		downloading XML and parsing
-		XStream xstream = new XStream(new StaxDriver());
-		xstream.ignoreUnknownElements();
-		xstream.processAnnotations(ServiceGroup.class);
-		ServiceGroup serviceGroup = null;
-		try {
-			String tmp = client.resource(url).get(String.class);
-			serviceGroup = (ServiceGroup) xstream.fromXML(tmp);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return serviceGroup;
-	}
-
-	public static HashMap<String, String> getCookies(List<NewCookie> cookies) {
-		HashMap<String, String> map = new HashMap<String, String>();
-		int count = 0;
-		for (NewCookie cookie : cookies) {
-			if ("XSRF-TOKEN".equals(cookie.getName())) {
-				map.put("XSRF-TOKEN", cookie.getValue());
-				count++;
-			}
-			if ("JSESSIONID".equals(cookie.getName())) {
-				map.put("JSESSIONID", cookie.getValue());
-				count++;
-			}
-			if (count == 2)
-				break;
-		}
-		return map;
-	}
-
-
-	public static List<String> getDomainAndSubdomains() {
-		List<String> domainList = new ArrayList<>();
-		try {
-			String responseRaw = resource.path(SMPPaths.REST_DOMAIN_LIST)
-					.queryParam("page", "-1")
-					.queryParam("pageSize", "-1")
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.get(String.class);
-			JSONArray restDomains = new JSONObject(responseRaw).getJSONArray("serviceEntities");
-
-			for (int i = 0; i < restDomains.length(); i++) {
-				JSONObject currentDomain = restDomains.getJSONObject(i);
-				String currentDomainStr = currentDomain.getString("domainCode").trim();
-				String currentSubdomainStr = "" + currentDomain.getString("smlSubdomain").trim().replaceAll("null", "");
-
-				String tmp = String.format("%s (%s)", currentDomainStr, currentSubdomainStr);
-
-				domainList.add(tmp);
-			}
-		} catch (Exception e) {
-		}
-		return domainList;
-	}
-
-	public static String getDomainSubDomainCombo(String domainCode) {
-		List<String> allDomains = getDomainAndSubdomains();
-		for (String allDomain : allDomains) {
-			if (allDomain.startsWith(domainCode + " ")) {
-				return allDomain;
-			}
-		}
-		return domainCode;
-	}
-
-
-	public static List<NewCookie> login(String role) {
-		String authTemplate = "{\"username\": \"%s\", \"password\": \"%s\"}";
-		TestDataProvider tdp = new TestDataProvider();
-		Map<String, String> user = tdp.getUserWithRole(role);
-		String auth = String.format(authTemplate, user.get("username"), user.get("password"));
-
-		List<NewCookie> session = resource.path(SMPPaths.LOGIN_PATH).accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON_TYPE)
-				.post(ClientResponse.class, auth).getCookies();
-		return session;
-	}
-
-	public static List<String> getSysAdmins() {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String responseRaw = resource.path(SMPPaths.USER_LIST)
-					.queryParam("page", "-1")
-					.queryParam("pageSize", "-1")
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.get(String.class);
-			JSONArray users = new JSONObject(responseRaw).getJSONArray("serviceEntities");
-
-			List<String> sysadmins = new ArrayList<>();
-
-			for (int i = 0; i < users.length(); i++) {
-				JSONObject usr = users.getJSONObject(i);
-				if (usr.getString("role").equalsIgnoreCase("SYSTEM_ADMIN")) {
-					sysadmins.add(usr.getString("username"));
-				}
-			}
-			return sysadmins;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static List<String> getKeyStoreEntries() {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String responseRaw = resource.path(SMPPaths.KEYSTORE)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.get(String.class);
-			JSONArray entries = new JSONObject(responseRaw).getJSONArray("serviceEntities");
-
-			List<String> entryList = new ArrayList<>();
-
-			for (int i = 0; i < entries.length(); i++) {
-
-
-				String id = entries.getJSONObject(i).getString("certificateId");
-				String alias = entries.getJSONObject(i).getString("alias");
-				entryList.add(String.format("%s (%s)", alias, id));
-			}
-			return entryList;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-
-	public static boolean createDomain(String domainCode) {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		String template = "[{\"domainCode\":\"%s\",\"smlSubdomain\":\"%s\",\"smlSmpId\":\"%s\",\"smlClientKeyAlias\":\"%s\",\"signatureKeyAlias\":\"%s\",\"status\":2,\"smlClientCertHeader\":\"%s\"}]";
-		String domainPostStr = String.format(template, domainCode, domainCode, domainCode, domainCode, domainCode, domainCode);
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		log.info("Creating domain template whose xsrf :" + xsrf + " and session id: " + jsessionID);
-		log.info("Creating domain template whose value is :" + template);
-		log.info("Creating the doamainpoststring" + domainPostStr);
-		try {
-			ClientResponse getResponse = resource.path(SMPPaths.REST_POST_DOMAIN)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, domainPostStr);
-			log.info("Create domain return status code is:" + getResponse.getStatus());
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return false;
-	}
-
-	public static boolean createUser(String username, String role) {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		String template = "[{\"active\":true,\"username\":\"%s\",\"emailAddress\":\"\",\"password\":\"QW!@qw12\",\"confirmation\":\"\",\"role\":\"%s\",\"status\":2,\"statusPassword\":2,\"certificate\":{\"subject\":\"\",\"validFrom\":null,\"validTo\":null,\"issuer\":\"\",\"serialNumber\":\"\",\"certificateId\":\"\",\"fingerprints\":\"\"}}]";
-		String postStr = String.format(template, username, role);
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			ClientResponse getResponse = resource.path(SMPPaths.USER_LIST)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, postStr);
-
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static boolean createServiceGroup(String pi, String ps, List<String> usernames, List<String> domainCodes) {
-		String template = "[{\"id\":null,\"extensionStatus\":1,\"participantIdentifier\":\"%s\",\"participantScheme\":\"%s\",\"serviceMetadata\":[],\"users\":%s,\"serviceGroupDomains\":%s,\"extension\":\"\",\"status\":2}]";
-
-		try {
-			List<NewCookie> cookies = login("SMP_ADMIN");
-			HashMap<String, String> map = getCookies(cookies);
-			String xsrf = map.get("XSRF-TOKEN");
-			String jsessionID = map.get("JSESSIONID");
-
-			JSONArray users = new JSONArray();
-			for (String username : usernames) {
-				users.put(transformUserForSGPost(getUserForName(username, jsessionID, xsrf)));
-			}
-
-			JSONArray domains = new JSONArray();
-			for (String codes : domainCodes) {
-				domains.put(transformDomainForSGPost(getDomainForName(codes)));
-			}
-
-
-			String postStr = String.format(template, pi, ps, users.toString(), domains.toString());
-			log.info("post str is :" + postStr);
-
-			ClientResponse getResponse = resource.path(SMPPaths.SERVICE_GROUP)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, postStr);
-
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static boolean createMetadata(String pi) {
-		String template = "{\"documentIdentifier\":\"%s\",\"documentIdentifierScheme\":\"%s\",\"smlSubdomain\":\"%s\",\"domainCode\":\"%s\",\"domainId\":%s,\"status\":2,\"xmlContentStatus\":2}";
-		String xmlTemplate = "<ServiceMetadata xmlns=\"http://docs.oasis-open.org/bdxr/ns/SMP/2016/05\"> <ServiceInformation> <ParticipantIdentifier scheme=\"%s\">%s</ParticipantIdentifier> <DocumentIdentifier scheme=\"%s\">%s</DocumentIdentifier> <ProcessList> <Process> <ProcessIdentifier scheme=\"[enterProcessType]\">[enterProcessName]</ProcessIdentifier> <ServiceEndpointList> <Endpoint transportProfile=\"bdxr-transport-ebms3-as4-v1p0\"> <EndpointURI>https://mypage.eu</EndpointURI> <Certificate>UGFzdGUgYmFzZTY0IGVuY29kZWQgY2VydGlmaWNhdGUgb2YgQVA=</Certificate> <ServiceDescription>Service description for partners</ServiceDescription> <TechnicalContactUrl>www.best-page.eu</TechnicalContactUrl> </Endpoint> </ServiceEndpointList> </Process> </ProcessList> </ServiceInformation> </ServiceMetadata>";
-
-		try {
-			JSONObject sg = getSGforPI(pi);
-			JSONObject domain = sg.getJSONArray("serviceGroupDomains").getJSONObject(0);
-			String domainCode = domain.getString("domainCode");
-			String subdomain = domain.getString("smlSubdomain");
-			String domainId = domain.getString("domainId");
-			String docID = Generator.randomAlphaNumeric(5);
-			String docscheme = Generator.randomAlphaNumeric(5);
-
-			String xmlContent = String.format(xmlTemplate, sg.getString("participantScheme"), pi, docscheme, docID);
-
-			String postMeta = String.format(template, docID, docscheme, subdomain, domainCode, domainId);
-
-			sg.getJSONArray("serviceMetadata").put(new JSONObject(postMeta).put("xmlContent", xmlContent));
-			sg.put("status", 1);
-
-
-			List<NewCookie> cookies = login("SMP_ADMIN");
-
-			HashMap<String, String> map = getCookies(cookies);
-			String xsrf = map.get("XSRF-TOKEN");
-			String jsessionID = map.get("JSESSIONID");
-			ClientResponse getResponse = resource.path(SMPPaths.SERVICE_GROUP)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, new JSONArray().put(sg).toString());
-
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static String getMetadataString(String url) {
-		try {
-
-			System.out.println("url = " + url);
-//			------------------------------
-			return client.resource(url).accept(MediaType.APPLICATION_XML).get(String.class);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return "";
-	}
-
-	private static JSONObject getUserForName(String username, String jsessionID, String xsrf) {
-
-		try {
-			String responseRaw = resource.path(SMPPaths.USER_LIST)
-					.queryParam("page", "-1")
-					.queryParam("pageSize", "-1")
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.get(String.class);
-			JSONArray users = new JSONObject(responseRaw).getJSONArray("serviceEntities");
-
-			for (int i = 0; i < users.length(); i++) {
-				JSONObject usr = users.getJSONObject(i);
-				if (username.equalsIgnoreCase(usr.getString("username"))) {
-					return usr;
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private static JSONObject getDomainForName(String domainName) {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String responseRaw = resource.path(SMPPaths.REST_DOMAIN_LIST)
-					.queryParam("page", "-1")
-					.queryParam("pageSize", "-1")
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.get(String.class);
-			JSONArray domains = new JSONObject(responseRaw).getJSONArray("serviceEntities");
-			for (int i = 0; i < domains.length(); i++) {
-				JSONObject dom = domains.getJSONObject(i);
-				if (domainName.equalsIgnoreCase(dom.getString("domainCode"))) {
-					return dom;
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private static JSONObject getSGforPI(String pi) {
-		List<NewCookie> cookies = login("SMP_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String responseRaw = resource.path(SMPPaths.SERVICE_GROUP)
-					.queryParam("page", "-1")
-					.queryParam("pageSize", "-1")
-					.queryParam("participantIdentifier", pi)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.get(String.class);
-			JSONArray sgs = new JSONObject(responseRaw).getJSONArray("serviceEntities");
-			for (int i = 0; i < sgs.length(); i++) {
-				JSONObject sg = sgs.getJSONObject(i);
-				if (pi.equalsIgnoreCase(sg.getString("participantIdentifier"))) {
-					return sg;
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static String getSystemInfo() {
-
-		try {
-			return resource.path(SMPPaths.SYS_INFO).get(String.class);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-
-	public static boolean deleteDomain(String domainCode) {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String domainPostStr = "[" + getDomainForName(domainCode).put("status", 3).toString() + "]";
-			ClientResponse getResponse = resource.path(SMPPaths.REST_POST_DOMAIN)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, domainPostStr);
-
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static boolean deleteUser(String username) {
-		List<NewCookie> cookies = login("SYS_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String putStr = "[" + getUserForName(username, jsessionID, xsrf).put("status", 3).toString() + "]";
-			ClientResponse getResponse = resource.path(SMPPaths.USER_LIST)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, putStr);
-
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static boolean deleteSG(String pi) {
-		List<NewCookie> cookies = login("SMP_ADMIN");
-		HashMap<String, String> map = getCookies(cookies);
-		String xsrf = map.get("XSRF-TOKEN");
-		String jsessionID = map.get("JSESSIONID");
-		try {
-			String putStr = "[" + getSGforPI(pi).put("status", 3).toString() + "]";
-			ClientResponse getResponse = resource.path(SMPPaths.SERVICE_GROUP)
-					.accept(MediaType.APPLICATION_JSON_TYPE)
-					.type(MediaType.APPLICATION_JSON_TYPE)
-					.cookie(new Cookie("JSESSIONID", jsessionID))
-					.cookie(new Cookie("XSRF-TOKEN", xsrf))
-					.header("X-XSRF-TOKEN", xsrf)
-					.put(ClientResponse.class, putStr);
-
-			return getResponse.getStatus() == 200;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-
-	private static JSONObject transformUserForSGPost(JSONObject user) {
-		try {
-			String template = "{\"index\":%s,\"username\":\"%s\",\"role\":\"%s\",\"userId\":%s,\"status\":0,\"password\":null,\"passwordExpireOn\":null,\"accessTokenId\":null,\"accessTokenExpireOn\":null,\"passwordExpired\":true,\"emailAddress\":\"\",\"authorities\":null,\"active\":true,\"certificate\":null,\"statusPassword\":0,\"casAuthenticated\": false,\"forceChangeExpiredPassword\": false, \"showPasswordExpirationWarning\": false}";
-			String index = user.getString("index");
-			String username = user.getString("username");
-			String role = user.getString("role");
-			String id = user.getString("userId");
-			return new JSONObject(String.format(template, index, username, role, id));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private static JSONObject transformDomainForSGPost(JSONObject domain) {
-		try {
-			String template = "{\"domainId\":%s,\"domainCode\":\"%s\",\"smlSubdomain\":\"%s\",\"id\":null,\"smlRegistered\":false,\"serviceMetadataCount\":0,\"status\":2}";
-			String domainId = domain.getString("id");
-			String domainCode = domain.getString("domainCode");
-			String smlSubdomain = domain.getString("smlSubdomain");
-			return new JSONObject(String.format(template, domainId, domainCode, smlSubdomain));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/smp-ui-tests/src/main/resources/certificate/policy-test-ca.cer b/smp-ui-tests/src/main/resources/certificate/policy-test-ca.cer
deleted file mode 100644
index ad46969e6916ca3ea7930d1724de330923b6a82e..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/resources/certificate/policy-test-ca.cer
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB8TCCAVqgAwIBAgICJxAwDQYJKoZIhvcNAQELBQAwKjELMAkGA1UEAwwCQ0Ex
-DjAMBgNVBAoMBWRpZ2l0MQswCQYDVQQGEwJFVTAeFw0yMjA2MDkwNjM4MDVaFw0z
-MjA2MDcwNjM4MDVaMCoxCzAJBgNVBAMMAkNBMQ4wDAYDVQQKDAVkaWdpdDELMAkG
-A1UEBhMCRVUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJRxv2YAv8nqGnkw
-tP+cDcO8BOy/Lyw0ZoVSIV3onU4lngy4mRLNOYWN+prUk1AVEAL/I0PJdrsiMT+M
-3ygTNUerhdx3C/Hft2nhUU2LvJWlEAP7cOAVy3k81v3811NDi8GcZ31qKmm92AI7
-LnKA/AdP7174oF/der5bmPCHVxl/AgMBAAGjJjAkMA8GA1UdEwEB/wQFMAMBAf8w
-EQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBCwUAA4GBAET1y8rJkMMvqVWm
-1eLT7l90evi8U+FLETrlEYgm8/d182HL5IEninuzwK10xVvfMmb8IURWEx5+wJgX
-sPMBnX5xxQGy1vSVUnq26Clggo2UUP44z7xIxzCtaTqEKvXZNffM26geiu0QTWin
-N0j9vezNtonTzfNRZdIEYe2vkl/C
------END CERTIFICATE-----
diff --git a/smp-ui-tests/src/main/resources/keystore/keystore_dummy1.jks b/smp-ui-tests/src/main/resources/keystore/keystore_dummy1.jks
deleted file mode 100644
index 1db3d26fb051cb0eba8d4e46b42f77fc3a5c9ca6..0000000000000000000000000000000000000000
Binary files a/smp-ui-tests/src/main/resources/keystore/keystore_dummy1.jks and /dev/null differ
diff --git a/smp-ui-tests/src/main/resources/log4j.properties b/smp-ui-tests/src/main/resources/log4j.properties
deleted file mode 100644
index 5322420656ba03cc44e7d06ef2eff77ac371e57a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-#log4j.appender.A1.layout.ConversionPattern=%d   %-5p %c - %m%n
-log4j.appender.A1.layout.ConversionPattern=%d   %x %5p [%t] - (%c:%L) - %m%n
\ No newline at end of file
diff --git a/smp-ui-tests/src/main/resources/testData.json b/smp-ui-tests/src/main/resources/testData.json
deleted file mode 100644
index 3598128f7f311b13ad8a32b85fb56ff6271c1d7c..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/main/resources/testData.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "loginUsers" : {
-	"SYS_ADMIN" : {"username": "system", "password":"123456"},
-	"SMP_ADMIN" : {"username": "smp", "password":"123456"},
-	"SG_ADMIN" : {"username": "user", "password":"123456"}
-  }
-}
\ No newline at end of file
diff --git a/smp-ui-tests/src/test/java/customReporter/ExcelTestReporter.java b/smp-ui-tests/src/test/java/customReporter/ExcelTestReporter.java
deleted file mode 100644
index f7de2399592db4e045e205af29c5831ceec849f7..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/customReporter/ExcelTestReporter.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package customReporter;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
-import org.openqa.selenium.WebDriver;
-import org.testng.ITestContext;
-import org.testng.ITestListener;
-import org.testng.ITestResult;
-import org.testng.annotations.Test;
-import ui.BaseTest;
-import utils.PROPERTIES;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class ExcelTestReporter implements ITestListener {
-
-	private static final String[] headers = {"Type", "Test Suite Name", "Test Case ID", "Test Case Name", "Can be run on Bamboo", "TC is disabled", "Test Result", "Last Execution Started", "Execution time", "JIRA tickets", "Impact", "Comment"};
-	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-	private static String filename;
-
-
-	@Override
-	/*Creates the report file, the sheet and writes the headers of the table with style as well*/
-	public void onStart(ITestContext iTestContext) {
-
-
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH-mm");
-		String dateStr = format.format(iTestContext.getStartDate());
-		filename = PROPERTIES.REPORTS_FOLDER + "TestRunReport" + dateStr + ".xlsx";
-
-		XSSFWorkbook workbook = new XSSFWorkbook();
-		Sheet sheet = workbook.createSheet("Run Report");
-
-		Row headerRow = sheet.createRow(0);
-		XSSFCellStyle headerStyle = composeCellStyle((XSSFWorkbook) sheet.getWorkbook(), "Header");
-
-		for (int i = 0; i < headers.length; i++) {
-			Cell cell = headerRow.createCell(i);
-			cell.setCellStyle(headerStyle);
-			cell.setCellValue(headers[i]);
-		}
-
-		try {
-			FileOutputStream os = new FileOutputStream(filename);
-			workbook.write(os);
-			workbook.close();
-			os.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	@Override
-	public void onFinish(ITestContext iTestContext) {
-
-	}
-
-	@Override
-	public void onTestStart(ITestResult iTestResult) {
-
-	}
-
-	/* Writes a row in the report file with the test id, name  and Pass as status */
-	@Override
-	public void onTestSuccess(ITestResult iTestResult) {
-		try {
-			writeRowToReportFile(iTestResult, "Pass");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/* Writes a row in the report file with the test id, name  and FAIL as status*/
-	@Override
-	public void onTestFailure(ITestResult iTestResult) {
-		takeScreenshot(iTestResult);
-		try {
-			writeRowToReportFile(iTestResult, "FAIL");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/* Writes a row in the report file with the test id, name and Skipped as status */
-	@Override
-	public void onTestSkipped(ITestResult iTestResult) {
-		try {
-			writeRowToReportFile(iTestResult, "Skipped");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void onTestFailedButWithinSuccessPercentage(ITestResult iTestResult) {
-
-	}
-
-
-	/* depending on the type of cell returns the desired style. The supported type are "Header", "Fail", "Pass" */
-	private XSSFCellStyle composeCellStyle(XSSFWorkbook workbook, String type) {
-		XSSFCellStyle style = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setBold(true);
-
-		if (type.equalsIgnoreCase("Pass")) {
-			style.setFillBackgroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
-			style.setFillForegroundColor(IndexedColors.BRIGHT_GREEN.getIndex());
-
-		} else if (type.equalsIgnoreCase("Fail")) {
-			style.setFillBackgroundColor(IndexedColors.RED.getIndex());
-			style.setFillForegroundColor(IndexedColors.RED.getIndex());
-			style.setFont(font);
-
-		} else if (type.equalsIgnoreCase("Skipped")) {
-			style.setFillBackgroundColor(IndexedColors.WHITE.getIndex());
-			style.setFillForegroundColor(IndexedColors.WHITE.getIndex());
-			style.setFont(font);
-
-		} else if (type.equalsIgnoreCase("Header")) {
-			style.setFillBackgroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-			style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-			style.setFont(font);
-		}
-		style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-
-		return style;
-	}
-
-	/* Generic method to write a row in the report file with the test id, name and result */
-	private void writeRowToReportFile(ITestResult iTestResult, String result) throws Exception {
-
-		String qualifiedName = iTestResult.getMethod().getQualifiedName();
-		String testType = "";
-		if (qualifiedName.contains(".ui.")) {
-			testType = "UI";
-		}
-		if (qualifiedName.contains(".rest.")) {
-			testType = "REST";
-		}
-
-		File myFile = new File(filename);
-		FileInputStream inputStream = new FileInputStream(myFile);
-		XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
-
-		Sheet reportSheet = workbook.getSheetAt(0);
-		int rowNum = reportSheet.getLastRowNum() + 1;
-		Row currentRow = reportSheet.createRow(rowNum);
-
-		currentRow.createCell(0).setCellValue(testType);
-		currentRow.createCell(1).setCellValue(iTestResult.getTestContext().getSuite().getName());
-		currentRow.createCell(2).setCellValue(iTestResult.getMethod().getConstructorOrMethod().getMethod().getAnnotation(Test.class).description());
-		currentRow.createCell(3).setCellValue(iTestResult.getName());
-		currentRow.createCell(4).setCellValue("Yes");
-		currentRow.createCell(5).setCellValue(!iTestResult.getMethod().getConstructorOrMethod().getMethod().getAnnotation(Test.class).enabled());
-		Cell cell = currentRow.createCell(6);
-		cell.setCellValue(result);
-		cell.setCellStyle(composeCellStyle(workbook, result));
-		currentRow.createCell(7).setCellValue(sdf.format(new Date(iTestResult.getStartMillis())));
-		currentRow.createCell(8).setCellValue((iTestResult.getEndMillis() - iTestResult.getStartMillis()) / 1000);
-		currentRow.createCell(9).setCellValue("");
-		currentRow.createCell(10).setCellValue("");
-
-		if (iTestResult.getThrowable() != null) {
-			currentRow.createCell(11).setCellValue(iTestResult.getThrowable().getMessage());
-		}
-
-
-		FileOutputStream os = new FileOutputStream(myFile);
-		workbook.write(os);
-		os.close();
-		workbook.close();
-		inputStream.close();
-
-	}
-
-
-	private void takeScreenshot(ITestResult result) {
-
-		System.out.println("***** Error " + result.getName() + " test has failed *****");
-		String methodName = "target/" + result.getName().toString().trim();
-
-		WebDriver driver = ((BaseTest) result.getInstance()).driver;
-		File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
-
-		try {
-			FileUtils.copyFile(scrFile, new File(methodName + ".png"));
-			System.out.println("***Placed screen shot in " + methodName + ".png ***");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-
-}
diff --git a/smp-ui-tests/src/test/java/customReporter/TestProgressReporter.java b/smp-ui-tests/src/test/java/customReporter/TestProgressReporter.java
deleted file mode 100644
index e46928bbb4b5afb854b9184f5fa6b3ffa2c1c262..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/customReporter/TestProgressReporter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package customReporter;
-
-import org.apache.log4j.Logger;
-import org.testng.ITestContext;
-import org.testng.ITestListener;
-import org.testng.ITestResult;
-
-public class TestProgressReporter implements ITestListener {
-
-
-	static int test_count = 0;
-	static int passed_count = 0;
-	static int failed_count = 0;
-	static int skipped_count = 0;
-	static int total_test_count = 0;
-	Logger log = Logger.getLogger(this.getClass());
-
-	@Override
-	public void onStart(ITestContext context) {
-		total_test_count = context.getSuite().getAllMethods().size();
-		log.info("Tests methods to run - " + total_test_count);
-	}
-
-	@Override
-	public void onTestSuccess(ITestResult result) {
-		test_count++;
-		passed_count++;
-		logTestCounts();
-	}
-
-	@Override
-	public void onTestFailure(ITestResult result) {
-		test_count++;
-		failed_count++;
-		logTestCounts();
-	}
-
-	@Override
-	public void onTestSkipped(ITestResult result) {
-		test_count++;
-		skipped_count++;
-		logTestCounts();
-	}
-
-	private void logTestCounts() {
-		log.info(String.format("-------- Passed - %s --------", passed_count));
-		log.info(String.format("-------- Failed - %s --------", failed_count));
-		log.info(String.format("-------- Skipped - %s --------", skipped_count));
-		log.info(String.format("-------- Ran %s tests out of %s --------", test_count, total_test_count));
-	}
-
-
-}
diff --git a/smp-ui-tests/src/test/java/ui/BaseTest.java b/smp-ui-tests/src/test/java/ui/BaseTest.java
deleted file mode 100644
index 6831cbb6c73c5af3552166213b6d3eadfc004b27..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/BaseTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package ui;
-
-import customReporter.ExcelTestReporter;
-import customReporter.TestProgressReporter;
-import org.apache.log4j.Logger;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.WebDriver;
-import org.testng.annotations.*;
-import pages.components.baseComponents.SMPPage;
-import utils.DriverManager;
-import utils.Generator;
-import utils.PROPERTIES;
-import utils.TestDataProvider;
-import utils.rest.SMPRestClient;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Listeners({ExcelTestReporter.class, TestProgressReporter.class})
-public class BaseTest {
-
-	public static WebDriver driver;
-	static int methodCount = 1;
-	static TestDataProvider testDataProvider = new TestDataProvider();
-	static ArrayList<String> createdDomains = new ArrayList<>();
-	static ArrayList<String> createdUsers = new ArrayList<>();
-	static ArrayList<String> createdServiceGroups = new ArrayList<>();
-	protected Logger logger = Logger.getLogger(this.getClass());
-
-	@BeforeSuite(alwaysRun = true)
-	public void beforeSuite() {
-
-		logger.info("********************** SUT Info **********************");
-
-		System.out.println(SMPRestClient.getSystemInfo());
-
-		logger.info("********************** SUT Info **********************");
-
-		logger.info("Creating necessary data !!!!");
-		createDomains();
-		createUsers();
-		createSGs();
-	}
-
-
-	@AfterSuite(alwaysRun = true)
-	/*After the test suite is done, we close the browser*/
-	public void afterSuite() {
-		logger.info("Deleting created data!!!");
-
-		deleteTestData();
-
-		logger.info("Quitting!!!! Buh bye!!!");
-		try {
-			if (null != driver) {
-				driver.quit();
-			}
-		} catch (Exception e) {
-			logger.warn("Closing the driver failed !!!!");
-			e.printStackTrace();
-		}
-	}
-
-	@AfterClass(alwaysRun = true)
-	public void afterClass() {
-		if (null != driver) {
-			driver.quit();
-		}
-	}
-
-	@BeforeClass(alwaysRun = true)
-	public void beforeClass() {
-		logger.info("beforeClass entry");
-		driver = DriverManager.getDriver();
-		driver.get(PROPERTIES.UI_BASE_URL);
-		logger.info("beforeClass exit");
-	}
-
-	@BeforeMethod(alwaysRun = true)
-	protected void logSeparator(Method method) throws Exception {
-
-		logger.info("--------------------------- Running test number: " + methodCount);
-		logger.info("--------------------------- Running test method: " + method.getDeclaringClass().getSimpleName() + "." + method.getName());
-		methodCount++;
-	}
-
-
-	private void createDomains() {
-		for (int i = 0; i < 5; i++) {
-			String generated = Generator.randomAlphaNumeric(10);
-			logger.info("creating domain whose value is :" + generated);
-			boolean created = SMPRestClient.createDomain(generated);
-			if (created) {
-				createdDomains.add(generated);
-			} else {
-				logger.warn("Test data creation: Domain creation failed for " + generated);
-				System.exit(-1);
-			}
-		}
-	}
-
-	private void createUsers() {
-		String[] roles = {"SMP_ADMIN", "SERVICE_GROUP_ADMIN", "SYSTEM_ADMIN"};
-		for (int i = 0; i < 6; i++) {
-			String generated = Generator.randomAlphaNumeric(10);
-			String role = roles[i % roles.length];
-			boolean created = SMPRestClient.createUser(generated, role);
-			if (created) {
-				createdUsers.add(generated);
-			} else {
-				logger.warn("Test data creation: User creation failed for " + generated);
-				System.exit(-1);
-			}
-		}
-	}
-
-	private void createSGs() {
-		for (int i = 0; i < 5; i++) {
-			String generated = Generator.randomAlphaNumeric(10);
-			String generatedHyphen = generated.substring(0, 3) + "-" + generated.substring(3, 6) + "-" + generated.substring(6, 9);
-			List<String> users = Arrays.asList(createdUsers.get(0));
-			List<String> domains = Arrays.asList(createdDomains.get(0));
-			boolean created = SMPRestClient.createServiceGroup(generated, generatedHyphen, users, domains);
-			if (created) {
-				createdServiceGroups.add(generated);
-			} else {
-				logger.warn("Test data creation: SG creation failed for " + generated);
-				System.exit(-1);
-			}
-		}
-	}
-
-	private void deleteTestData() {
-		for (String createdServiceGroup : createdServiceGroups) {
-			try {
-				SMPRestClient.deleteSG(createdServiceGroup);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		for (String createdUser : createdUsers) {
-			try {
-				SMPRestClient.deleteUser(createdUser);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		for (String createdDomain : createdDomains) {
-			try {
-				SMPRestClient.deleteDomain(createdDomain);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-
-	protected void genericLogoutProcedure() {
-		logger.info("executing the generic logout procedure");
-
-		SMPPage page = new SMPPage(driver);
-		page.refreshPage();
-
-		try {
-			if (page.pageHeader.sandwichMenu.isLoggedIn()) {
-				logger.info("Logout!!");
-				page.pageHeader.sandwichMenu.logout();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		driver.manage().deleteAllCookies();
-		((JavascriptExecutor) driver).executeScript("localStorage.clear();");
-
-		page.refreshPage();
-		page.waitForXMillis(100);
-	}
-
-	protected SMPPage genericLoginProcedure(String role) {
-		SMPPage page = new SMPPage(driver);
-
-		genericLogoutProcedure();
-
-		if (!page.pageHeader.sandwichMenu.isLoggedIn()) {
-			logger.info("Login!!");
-			page.pageHeader.goToLogin().login(role);
-		}
-
-		page.waitForRowsToLoad();
-		return page;
-	}
-
-}
-
diff --git a/smp-ui-tests/src/test/java/ui/DomainPgTest.java b/smp-ui-tests/src/test/java/ui/DomainPgTest.java
deleted file mode 100644
index 35c656d99daefc99fe8e4a268edd4b7b703abbbb..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/DomainPgTest.java
+++ /dev/null
@@ -1,525 +0,0 @@
-package ui;
-
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.SMPPage;
-import pages.components.messageArea.AlertMessage;
-import pages.domain.DomainGrid;
-import pages.domain.DomainPage;
-import pages.domain.DomainPopup;
-import pages.domain.DomainRow;
-import pages.keystore.KeyStoreEditDialog;
-import pages.keystore.KeyStoreImportDialog;
-import utils.Generator;
-import utils.enums.SMPMessages;
-import utils.rest.SMPRestClient;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class DomainPgTest extends BaseTest {
-
-	@AfterMethod
-	public void logoutAndReset() {
-		genericLogoutProcedure();
-	}
-
-
-	@BeforeMethod
-	public void loginAndGoToDomainPage() {
-
-		SMPPage page = genericLoginProcedure("SYS_ADMIN");
-
-		logger.info("Going to Domain page");
-		page.sidebar.goToPage(DomainPage.class);
-	}
-
-	@Test(description = "DMN-0")
-	public void openDomainPage() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		DomainGrid grid = page.grid();
-		DomainRow row0 = grid.getRowsInfo().get(0);
-		grid.doubleClickRow(0);
-
-		DomainPopup popup = new DomainPopup(driver);
-
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-
-		soft.assertTrue(!popup.isDomainCodeInputEnabled(), "On double click Domain Code input is disabled");
-		soft.assertTrue(!popup.isSMLDomainInputEnabled(), "On double click SML Domain input is disabled");
-
-		popup.clickCancel();
-
-		soft.assertEquals(row0, page.grid().getRowsInfo().get(0), "Row is unchanged");
-		soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is not enabled");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-10")
-	public void editDomain() {
-
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		DomainGrid grid = page.grid();
-		DomainRow row0 = grid.getRowsInfo().get(0);
-		grid.doubleClickRow(0);
-
-		DomainPopup popup = new DomainPopup(driver);
-
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-
-		soft.assertTrue(!popup.isDomainCodeInputEnabled(), "On double click Domain Code input is disabled");
-		soft.assertTrue(!popup.isSMLDomainInputEnabled(), "On double click SML Domain input is disabled");
-
-		String rndString = Generator.randomAlphaNumeric(10);
-		popup.fillSMLSMPIdInput(rndString);
-		popup.clickCancel();
-
-		soft.assertEquals(row0, page.grid().getRowsInfo().get(0), "Row 0 is not changed");
-
-		page.grid().doubleClickRow(0);
-		popup = new DomainPopup(driver);
-		popup.fillSMLSMPIdInput(rndString);
-		popup.clickOK();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-		soft.assertNotEquals(row0, page.grid().getRowsInfo().get(0), "Row 0 is changed");
-
-		page.clickSave().confirm();
-
-		DomainRow newRow0 = page.grid().getRowsInfo().get(0);
-		soft.assertNotEquals(row0, newRow0, "Row 0 is changed after save");
-		soft.assertEquals(newRow0.getSmlSmpID(), rndString, "SML SMP ID is changed to the desired string");
-
-		soft.assertEquals(page.alertArea.getAlertMessage().getMessage(), SMPMessages.MSG_18, "Proper message displayed");
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "DMN-20")
-	public void newDomain() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
-
-		String rndString = Generator.randomAlphaNumeric(10);
-
-
-		popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
-		popup.clickCancel();
-
-		soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is NOT enabled");
-
-		popup = page.clickNew();
-		popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
-		popup.clickOK();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-
-		page.clickSave().confirm();
-
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18),
-				"Success message is as expected");
-
-		List<DomainRow> rows = page.grid().getRowsInfo();
-		while (page.pagination.hasNextPage()) {
-			page.pagination.goToNextPage();
-			rows.addAll(page.grid().getRowsInfo());
-		}
-
-		boolean found = false;
-		for (DomainRow row : rows) {
-			if (row.getDomainCode().equalsIgnoreCase(rndString)) {
-				found = true;
-				break;
-			}
-		}
-
-		soft.assertTrue(found, "Found new domain in the list of domains");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-30")
-	public void cancelNewDomainCreation() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
-
-		String rndString = Generator.randomAlphaNumeric(10);
-
-
-		popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
-		popup.waitForXMillis(1000);
-		popup.clickOK();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-
-		List<DomainRow> rows = page.grid().getRowsInfo();
-		while (page.pagination.hasNextPage()) {
-			page.pagination.goToNextPage();
-			rows.addAll(page.grid().getRowsInfo());
-		}
-
-		boolean found = false;
-		for (DomainRow row : rows) {
-			if (row.getDomainCode().equalsIgnoreCase(rndString)) {
-				found = true;
-				break;
-			}
-		}
-
-		soft.assertTrue(!found, "New domain NOT in the list of domains");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-40")
-	public void deleteDomain() {
-		String rndStr = Generator.randomAlphaNumeric(10);
-		SMPRestClient.createDomain(rndStr);
-
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-
-		page.refreshPage();
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
-
-		int index = page.grid().scrollToDomain(rndStr);
-
-		page.grid().selectRow(index);
-
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row selected");
-
-		page.clickDelete();
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled (2)");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-
-		soft.assertTrue(page.grid().isDomainStillPresent(rndStr), "Row is still present");
-
-		index = page.grid().scrollToDomain(rndStr);
-		page.grid().selectRow(index);
-		page.clickDelete();
-		page.clickSave().confirm();
-
-		soft.assertTrue(!page.grid().isDomainStillPresent(rndStr), "Row is still NOT present after delete");
-
-
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-50")
-	public void deleteDomainWithSG() {
-
-		String domainName = Generator.randomAlphaNumeric(10);
-		String pi = Generator.randomAlphaNumeric(10);
-		String ps = Generator.randomAlphaNumeric(10);
-
-		String expectedErrorMess = String.format("Delete validation error Could not delete domains used by Service groups! Domain: %s (%s ) uses by:1 SG.", domainName, domainName);
-
-		SMPRestClient.createDomain(domainName);
-		SMPRestClient.createServiceGroup(pi, ps, new ArrayList<>(Arrays.asList("smp")), new ArrayList<>(Arrays.asList(domainName)));
-
-		SoftAssert soft = new SoftAssert();
-
-		DomainPage page = new DomainPage(driver);
-		page.refreshPage();
-
-		int index = page.grid().scrollToDomain(domainName);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		AlertMessage message = page.alertArea.getAlertMessage();
-		soft.assertTrue(message.isError(), "Page shows error message when deleting domain with SG");
-		soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
-
-		SMPRestClient.deleteSG(pi);
-		SMPRestClient.deleteDomain(domainName);
-
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-60")
-	public void duplicateDomainCreation() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		String errorMsg = "The Domain code already exists!";
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		String rndString = Generator.randomAlpha(10);
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
-		popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
-		popup.clickOK();
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-		page.clickSave().confirm();
-		page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
-		popup.fillDataForNewDomain(rndString, rndString, rndString, rndString);
-		soft.assertEquals(popup.getDuplicateDomainErrorMsgText(), errorMsg, "The message is not matching with our expected error message");
-		soft.assertFalse(popup.isEnableOkButton(), "Ok button is enabled");
-		soft.assertTrue(popup.isEnableCancelButton(), "Cancel button is disabled");
-		popup.clickCancel();
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-70")
-	public void onlyDomainCodeSavingMsgVerify() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		int index = page.grid().scrollToSmlDomain("");
-		if (index >= 0) {
-			try {
-				page.grid().selectRow(index);
-				page.clickDelete();
-				page.clickSave().confirm();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		String rndString = Generator.randomAlpha(10);
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		popup.clearAndFillDomainCodeInput(rndString);
-		soft.assertTrue(popup.isEnableOkButton(), "Ok button is disabled");
-		popup.clickOK();
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-		page.clickSave().confirm();
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18),
-				"Success message is as expected");
-		index = page.grid().scrollToSmlDomain("");
-		if (index >= 0) {
-			page.grid().scrollRow(index);
-		}
-		int rowNumber = index + 1;
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-80")
-	public void onlyDomainCodeAndSMLDomainSavingMsgVerify() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		String rndString = Generator.randomAlphaNumeric(10);
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		popup.clearAndFillDomainCodeInput(rndString);
-		popup.clearAndFillSMLDomainInput(rndString);
-		soft.assertTrue(popup.isEnableOkButton(), "Ok button is disabled");
-		popup.clickOK();
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-		page.clickSave().confirm();
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18),
-				"Success message is as expected");
-		int index = page.grid().scrollToSmlDomain(rndString);
-		if (index >= 0) {
-			page.grid().scrollRow(index);
-		}
-		int rowNumber = index + 1;
-		page.grid().mouseHoverOnDomainCode(rowNumber);
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-90")
-	public void createKeyStore() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		String pass = "test123";
-		KeyStoreEditDialog keyStoreEdit = page.clickEditKeyStore();
-		int keyStoreRowBeforeAddition = keyStoreEdit.grid().getRowsNo();
-		KeyStoreImportDialog keyStoreImport = keyStoreEdit.clickImportKeystore();
-		keyStoreImport.chooseKeystoreFile("src/main/resources/keystore/keystore_dummy1.jks");
-		Assert.assertEquals(keyStoreImport.getKeyStoreFileName(), "keystore_dummy1.jks", "the keystore file name is not correct");
-		keyStoreImport.fillPassword(pass);
-		keyStoreImport.clickImportBtn();
-		keyStoreEdit.clickCloseInKeystore();
-		soft.assertFalse(page.alertArea.getAlertMessage().isError());
-		keyStoreEdit = page.clickEditKeyStore();
-		int keyStoreRowAfterAddition = keyStoreEdit.grid().getRowsNo();
-		soft.assertEquals(keyStoreRowAfterAddition, keyStoreRowBeforeAddition + 1, "KeyStore is not added to the grid");
-		if (keyStoreRowAfterAddition > 1) {
-			keyStoreEdit.grid().deleteKeyStore(keyStoreRowAfterAddition - 1).confirm();
-			int keyStoreRowAfterDeletion = keyStoreEdit.grid().getRowsNo();
-			soft.assertEquals(keyStoreRowAfterDeletion, keyStoreRowAfterAddition - 1, "KeyStore is not delete from the grid");
-			keyStoreEdit.clickCloseInKeystore();
-			soft.assertFalse(page.alertArea.getAlertMessage().isError());
-		}
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-100")
-	public void allowDuplicateKeyStore() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		String pass = "test123";
-		KeyStoreEditDialog keyStoreEdit = page.clickEditKeyStore();
-		int keyStoreRowBeforeAddition = keyStoreEdit.grid().getRowsNo();
-		KeyStoreImportDialog keyStoreImport = keyStoreEdit.clickImportKeystore();
-		keyStoreImport.chooseKeystoreFile("src/main/resources/keystore/keystore_dummy1.jks");
-		Assert.assertEquals(keyStoreImport.getKeyStoreFileName(), "keystore_dummy1.jks", "the keystore file name is not correct");
-		keyStoreImport.fillPassword(pass);
-		keyStoreImport.clickImportBtn();
-		keyStoreEdit.clickCloseInKeystore();
-		soft.assertFalse(page.alertArea.getAlertMessage().isError());
-		keyStoreEdit = page.clickEditKeyStore();
-		int keyStoreRowAfterAddition = keyStoreEdit.grid().getRowsNo();
-		soft.assertEquals(keyStoreRowAfterAddition, keyStoreRowBeforeAddition + 1, "KeyStore is not added to the grid");
-		keyStoreRowBeforeAddition = keyStoreRowAfterAddition;
-		keyStoreImport = keyStoreEdit.clickImportKeystore();
-		keyStoreImport.chooseKeystoreFile("src/main/resources/keystore/keystore_dummy1.jks");
-		Assert.assertEquals(keyStoreImport.getKeyStoreFileName(), "keystore_dummy1.jks", "the keystore file name is not correct");
-		keyStoreImport.fillPassword(pass);
-		keyStoreImport.clickImportBtn();
-		keyStoreEdit.clickCloseInKeystore();
-		soft.assertFalse(page.alertArea.getAlertMessage().isError());
-		keyStoreEdit = page.clickEditKeyStore();
-		keyStoreRowAfterAddition = keyStoreEdit.grid().getRowsNo();
-		soft.assertEquals(keyStoreRowAfterAddition, keyStoreRowBeforeAddition + 1, "KeyStore is not added to the grid");
-		if (keyStoreRowAfterAddition > 1) {
-			keyStoreEdit.grid().deleteKeyStore(keyStoreRowAfterAddition - 1).confirm();
-			int keyStoreRowAfterDeletion = keyStoreEdit.grid().getRowsNo();
-			soft.assertEquals(keyStoreRowAfterDeletion, keyStoreRowAfterAddition - 1, "KeyStore is not delete from the grid");
-			keyStoreRowAfterAddition = keyStoreRowAfterDeletion;
-		}
-		if (keyStoreRowAfterAddition > 1) {
-			keyStoreEdit.grid().deleteKeyStore(keyStoreRowAfterAddition - 1).confirm();
-			int keyStoreRowAfterDeletion = keyStoreEdit.grid().getRowsNo();
-			soft.assertEquals(keyStoreRowAfterDeletion, keyStoreRowAfterAddition - 1, "KeyStore is not delete from the grid");
-			keyStoreEdit.clickCloseInKeystore();
-			soft.assertFalse(page.alertArea.getAlertMessage().isError());
-		}
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-110")
-	public void mandatoryDomainIdFieldVerification() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		String randstring = Generator.randomAlphaNumeric(10);
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		DomainPopup popup = page.clickNew();
-		popup.fillDataForNewDomain("", randstring, randstring, randstring);
-		soft.assertTrue(!popup.isEnableOkButton(), "Ok button is not disabled after leave domain input empty");
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-120")
-	public void verifyInvalidSMLSMPIDField() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		String randstring = Generator.randomAlpha(10);
-		ArrayList<String> smlsmpId = new ArrayList<>(Arrays.asList("abc@k",
-				"abcd-",
-				"-abgxknvlk",
-				"1qwertyuvbnm"));
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		DomainPopup popup = page.clickNew();
-		for (String smlsmpid : smlsmpId) {
-			popup.fillDataForNewDomain(randstring, randstring, smlsmpid, randstring);
-			soft.assertTrue(!popup.isEnableOkButton(), "OK button is enabled after sending the invalid smlsmpId");
-			soft.assertEquals(popup.getSmlSmpIdValidationMsg(), SMPMessages.SMLSMPID_VALIDATION_MESSAGE, "Error message is not in list");
-
-		}
-		soft.assertAll();
-	}
-
-	@Test(description = "DMN-130")
-	public void clientCertHeaderToggleTest() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		DomainPopup popup = page.clickNew();
-		soft.assertEquals(popup.checkedUserClientCertHeaderToggl(), "false", "The user toggle is on");
-		popup.clickUserClientCertHeaderToggle();
-		soft.assertEquals(popup.checkedUserClientCertHeaderToggl(), "true", "The user toggle is off");
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-140")
-	public void domainVerification() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is loaded");
-		ArrayList<String> domainCode = new ArrayList<>(Arrays.asList("sddfgf@",
-				"123%"));
-
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is loaded");
-
-		soft.assertTrue(popup.isDomainCodeInputEnabled(), "When defining new domain - Domain Code input is disabled");
-		soft.assertTrue(popup.isSMLDomainInputEnabled(), "When defining new domain -SML Domain input is disabled");
-
-		String rndString = Generator.randomAlphaNumeric(10);
-
-		for (String domain : domainCode) {
-			popup.fillDataForNewDomain(domain, rndString, rndString, rndString);
-
-			soft.assertTrue(!popup.isEnableOkButton(), "OK button is active after sending invalid domain code");
-			soft.assertEquals(popup.domainCodeValidationGetErrMsg(), SMPMessages.DOMAINCODE_VALIDATION_MESSAGE, "Message is not in the list");
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-150")
-	public void verifyNoOfCharcterAllowanceLimitInDomaincodeAndSMLSMPId() {
-		SoftAssert soft = new SoftAssert();
-		DomainPage page = new DomainPage(driver);
-		String randstring = Generator.randomAlphaNumeric(10);
-		String string = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz12345678901g";
-
-		soft.assertTrue(page.isLoaded(), "Check that the page is not loaded");
-		DomainPopup popup = page.clickNew();
-		soft.assertTrue(popup.isLoaded(), "Domain popup is not loaded");
-		popup.fillDataForNewDomain(string, randstring, string, randstring);
-		soft.assertEquals(popup.domainCode63CharValidationGetErrMsg(), SMPMessages.DOMAINCODE_VALIDATION_MESSAGE, "Message is not in the list");
-		soft.assertEquals(popup.getSmlSmpId63CharValidationMsg(), SMPMessages.SMLSMPID_VALIDATION_MESSAGE, "Error message is not in list");
-
-		soft.assertAll();
-	}
-}
diff --git a/smp-ui-tests/src/test/java/ui/EditPgTest.java b/smp-ui-tests/src/test/java/ui/EditPgTest.java
deleted file mode 100644
index db0638c600046e47edf296c9d54c179f35558ada..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/EditPgTest.java
+++ /dev/null
@@ -1,538 +0,0 @@
-package ui;
-
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.SMPPage;
-import pages.service_groups.ServiceGroupGrid;
-import pages.service_groups.ServiceGroupRow;
-import pages.service_groups.edit.*;
-import utils.Generator;
-import utils.enums.SMPMessages;
-import utils.rest.SMPRestClient;
-
-import java.util.List;
-
-@SuppressWarnings("SpellCheckingInspection")
-public class EditPgTest extends BaseTest {
-
-	@AfterMethod
-	public void logoutAndReset() {
-		genericLogoutProcedure();
-	}
-
-
-	@BeforeMethod
-	public void loginAndGoToEditPage() {
-
-		SMPPage page = genericLoginProcedure("SMP_ADMIN");
-
-		logger.info("Going to Edit page");
-		page.sidebar.goToPage(EditPage.class);
-	}
-
-
-	@Test(description = "EDT-10")
-	public void testFilters() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupRowE row0 = page.getGrid().getRowsAs(ServiceGroupRowE.class).get(0);
-		String pi = row0.getParticipantIdentifier();
-		String ps = row0.getParticipantScheme();
-
-		page.filterArea.filter(pi, ps, "");
-
-		List<ServiceGroupRowE> results = page.getGrid().getRowsAs(ServiceGroupRowE.class);
-		for (ServiceGroupRowE result : results) {
-			soft.assertTrue(result.getParticipantIdentifier().contains(pi), "Row matches searched participant identifier");
-			soft.assertTrue(result.getParticipantScheme().contains(ps), "Row matches searched participant scheme");
-		}
-
-		page.filterArea.filter(pi.substring(2), ps.substring(2), "");
-
-		results = page.getGrid().getRowsAs(ServiceGroupRowE.class);
-		for (ServiceGroupRowE result : results) {
-			soft.assertTrue(result.getParticipantIdentifier().contains(pi.substring(2)), "Row matches searched participant identifier stub");
-			soft.assertTrue(result.getParticipantScheme().contains(ps.substring(2)), "Row matches searched participant scheme stub");
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-20")
-	public void doubleclickRow() {
-		String extensionData = "<Extension xmlns=\"http://docs.oasis-open.org/bdxr/ns/SMP/2016/05\"><ExtensionID>df</ExtensionID><ExtensionName>sdxf</ExtensionName><!-- Custom element is mandatory by OASIS SMP schema. Replace following element with your XML structure. --><ext:example xmlns:ext=\"http://my.namespace.eu\">" + Generator.randomAlphaNumeric(10) + "</ext:example></Extension>";
-
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		String pi = row0.getParticipantIdentifier();
-		grid.doubleClickRow(index);
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-
-		soft.assertTrue(pi.equalsIgnoreCase(popup.getParticipantIdentifierValue()), "Popup opened for appropriate service group");
-		soft.assertTrue(popup.isExtensionAreaEditable(), "extension area is editable");
-
-		popup.enterDataInExtensionTextArea("kjsfdfjfhskdjfhkjdhfksdjhfjksdhfjksd");
-		popup.clickOK();
-		soft.assertTrue(!popup.getErrorMessage().isEmpty(), "When entering wrong data you get an error message on save");
-
-		popup.enterDataInExtensionTextArea(extensionData);
-		popup.clickOK();
-
-		page.saveChangesAndConfirm();
-
-		index = scrollToSG(pi);
-
-		page.getGrid().doubleClickRow(index);
-		ServiceGroupPopup popup2 = new ServiceGroupPopup(driver);
-		soft.assertEquals(popup2.getExtensionAreaContent(), extensionData, "Extension data is saved properly");
-
-		popup2.enterDataInExtensionTextArea("");
-		popup2.clickCancel();
-
-		index = scrollToSG(pi);
-
-		page.getGrid().doubleClickRow(index);
-		ServiceGroupPopup popup3 = new ServiceGroupPopup(driver);
-		soft.assertTrue(!popup3.getExtensionAreaContent().isEmpty(), "Extension data is NOT saved empty as expected");
-
-
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-30")
-	public void editActionButtonOnRow() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-
-		ServiceGroupPopup popup = row0.clickEdit();
-
-		soft.assertTrue(row0.getParticipantIdentifier().equalsIgnoreCase(popup.getParticipantIdentifierValue()), "Popup opened for appropriate service group");
-		soft.assertTrue(popup.isExtensionAreaEditable(), "extension area is editable");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-40")
-	public void editButtonOnPage() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-
-		soft.assertTrue(!page.isEditButtonEnabled(), "Edit button is not enabled before row is selected");
-
-		grid.selectRow(index);
-
-		soft.assertTrue(page.isEditButtonEnabled(), "Edit button is active after ro is selected");
-
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-
-		ServiceGroupPopup popup = page.clickEdit();
-
-		soft.assertTrue(row0.getParticipantIdentifier().equalsIgnoreCase(popup.getParticipantIdentifierValue()), "Popup opened for appropriate service group");
-		soft.assertTrue(popup.isExtensionAreaEditable(), "extension area is editable");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-50")
-	public void serviceGroupPopupUICheck() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		grid.doubleClickRow(index);
-
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-
-		soft.assertEquals(row0.getParticipantIdentifier().trim().toLowerCase(), popup.getParticipantIdentifierValue().trim().toLowerCase(), "Popup opened for appropriate service group");
-		soft.assertEquals(row0.getParticipantScheme().trim().toLowerCase(), popup.getParticipantSchemeValue().trim().toLowerCase(), "Popup opened for appropriate service group");
-		soft.assertTrue(popup.isExtensionAreaEditable(), "extension area is editable");
-
-		soft.assertTrue(!popup.isParticipantIdentifierInputEnabled(), "Participant Identifier field is disabled");
-		soft.assertTrue(!popup.isParticipantSchemeInputEnabled(), "Participant Scheme field is disabled");
-		soft.assertTrue(popup.isOwnersPanelEnabled(), "Owners panel is enabled");
-		soft.assertTrue(popup.isDomainsPanelEnabled(), "Domain panel is enabled");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-60")
-	public void newMetadataIcon() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-
-		ServiceMetadataPopup popup = row0.clickAddMetadata();
-
-		soft.assertTrue(row0.getParticipantIdentifier().equalsIgnoreCase(popup.getParticipantIdentifierValue()), "Popup opened for appropriate service group");
-
-		soft.assertTrue(popup.isDocumentIdentifierEnabled());
-		soft.assertTrue(popup.isDocumentSchemeEnabled());
-
-		soft.assertAll();
-	}
-
-
-//	Cannot identify the cause of failure so move on and hope for the best
-
-	@Test(description = "EDT-70")
-	public void noSYSADMINOwners() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		grid.doubleClickRow(index);
-
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-
-		popup.waitForXMillis(5000);
-
-		List<String> listedOptions = popup.ownersPanel.getOptions();
-		List<String> sysadmins = SMPRestClient.getSysAdmins();
-
-		for (String sysadmin : sysadmins) {
-			logger.info("Checking sysadmin " + sysadmin);
-			for (String listedOption : listedOptions) {
-				if (listedOption.equalsIgnoreCase(sysadmin)) {
-					soft.fail("Found sysadmin between options for SG owners - " + sysadmin);
-				}
-			}
-		}
-		soft.assertAll();
-
-	}
-
-	@Test(description = "EDT-80")
-	public void allDomainsInDomainsAccordionSection() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupGrid grid = page.getGrid();
-
-		Integer index = 0;
-
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		grid.doubleClickRow(index);
-
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-		popup.domainsPanel.expandSection();
-
-		List<String> listedOptions = popup.domainsPanel.getOptions();
-		List<String> domains = SMPRestClient.getDomainAndSubdomains();
-
-		for (String domain : domains) {
-			boolean found = false;
-			logger.info("Checking domain " + domain);
-			for (String listedOption : listedOptions) {
-				if (listedOption.equalsIgnoreCase(domain)) {
-					found = true;
-				}
-			}
-			soft.assertTrue(found, "Domain found in options - " + domain);
-		}
-
-
-		soft.assertAll();
-
-	}
-
-	@Test(description = "EDT-90")
-	public void extensionValidatedOnOK() {
-		String identifier = Generator.randomAlphaNumeric(7);
-		String tmpSchemeRoot = Generator.randomAlphaNumeric(3).toLowerCase();
-		String scheme = String.format("%s-%s-%s", tmpSchemeRoot, tmpSchemeRoot, tmpSchemeRoot);
-
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupPopup popup = page.clickNew();
-		popup.fillParticipantIdentifier(identifier);
-		popup.fillParticipantScheme(scheme);
-		popup.chooseFirstOwner();
-		popup.chooseFirstDomain();
-		popup.fillExtensionArea("invalid XML text");
-		popup.clickOK();
-
-		soft.assertTrue(!popup.getErrorMessage().isEmpty(), "Error message displayed when entering invalid xml in extension area");
-
-		popup.clickClear();
-		popup.generateRndExtension();
-		popup.clickOK();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is now active");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is now active");
-
-		page.clickSave().confirm();
-
-		soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is now inactive after save");
-		soft.assertTrue(!page.isCancelButtonEnabled(), "Cancel button is now inactive after save");
-
-		page.filterArea.filter(identifier, scheme, "");
-		soft.assertTrue(page.getGrid().getRows().get(0).getParticipantIdentifier().equalsIgnoreCase(identifier)
-				, "Service group was saved and is visible in search");
-
-
-		SMPRestClient.deleteSG(identifier);
-
-		identifier = Generator.randomAlphaNumeric(10);
-
-		popup = page.clickNew();
-		popup.fillParticipantIdentifier(identifier);
-		popup.fillParticipantScheme(scheme);
-		popup.chooseFirstOwner();
-		popup.chooseFirstDomain();
-		popup.clickOK();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is now active (2)");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is now active (2)");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-
-		soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is now inactive after cancel");
-		soft.assertTrue(!page.isCancelButtonEnabled(), "Cancel button is now inactive after cancel");
-
-		page.filterArea.filter(identifier, scheme, "");
-		soft.assertTrue(page.getGrid().getRowsNo() == 0
-				, "Service group was NOT saved and is NOT visible in search");
-
-		soft.assertAll();
-
-	}
-
-	@Test(description = "EDT-100")
-	public void deleteServiceGroup() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-
-		ServiceGroupRowE row0 = page.getGrid().getRowsAs(ServiceGroupRowE.class).get(0);
-		String identifier = row0.getParticipantIdentifier();
-		row0.clickDelete();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is now active");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is now active");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-
-		page.filterArea.filter(identifier, "", "");
-		soft.assertTrue(page.getGrid().getRows().get(0).getParticipantIdentifier().equalsIgnoreCase(identifier)
-				, "Service group was not deleted and is visible in search");
-
-		page.refreshPage();
-		ServiceGroupGrid grid = page.getGrid();
-		row0 = grid.getRowsAs(ServiceGroupRowE.class).get(0);
-		identifier = row0.getParticipantIdentifier();
-
-		grid.selectRow(0);
-
-		soft.assertTrue(page.isDeleteButtonEnabled(), "After row select Delete button is enabled");
-
-		page.clickDelete();
-
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is now active (2)");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is now active (2)");
-
-		page.clickSave().confirm();
-		page.waitForRowsToLoad();
-
-		page.filterArea.filter(identifier, "", "");
-		soft.assertTrue(page.getGrid().getRowsNo() == 0
-				, "Service group deleted and is NOT visible in search anymore");
-
-		soft.assertAll();
-
-	}
-
-	@Test(description = "EDT-110")
-	public void serviceMetadataDilogVerfication() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-		String generator = Generator.randomAlphaNumeric(10);
-		ServiceGroupGrid grid = page.getGrid();
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		ServiceMetadataPopup metadataPopup = row0.clickAddMetadata();
-		soft.assertTrue(!metadataPopup.isParticipantIdentifierEnabled(), "participantId field is enabled for an existing service group in service metadata popup");
-		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(), "participantScheme field is enabled for an existing service group in service metadata popup");
-		soft.assertEquals(metadataPopup.docIDFieldValue(), "", "docIDField is not empty");
-		soft.assertEquals(metadataPopup.docIDSchemeFieldValue(), "", "docIDField is not empty");
-		soft.assertTrue(row0.getParticipantIdentifier().equalsIgnoreCase(metadataPopup.getParticipantIdentifierValue()), "ServiceMetadata dialog opened for appropriate service group");
-		soft.assertTrue(row0.getParticipantScheme().equalsIgnoreCase(metadataPopup.getParticipantSchemeValue()), "ServiceMetadata dialog opened for appropriate service group");
-		metadataPopup.fillForm(generator, generator, generator);
-		ServiceMetadataWizardPopup metadataWizaedPopup = metadataPopup.clickMetadataWizard();
-		metadataWizaedPopup.fillForm(generator, generator, generator, generator, "bdxr-transport-ebms3-as4-v1p0", "internal/rest/domain");
-		metadataWizaedPopup.fillCerificateBox(generator);
-		soft.assertTrue(metadataWizaedPopup.isEnabledOkBtn(), "ok button is disabled after providing the valid data");
-		metadataPopup = metadataWizaedPopup.clickOK();
-		soft.assertEquals(metadataPopup.docIDFieldValue(), generator, "After saving the servicemetadata wizard popup with valid data the docID field of service metadata popup doc id contain the coressponding value");
-		soft.assertEquals(metadataPopup.docIDSchemeFieldValue(), generator, "After saving the servicemetadata wizard popup with valid data the docIDScheme field of service metadata popup doc id scheme contain the coressponding value");
-		soft.assertTrue(metadataPopup.isOKBtnEnabled(), "OK button is not enabled");
-		soft.assertAll();
-
-	}
-
-	@Test(description = "EDT-120")
-	public void verifyServicemtadataWizardDilogField() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-		String generator = Generator.randomAlphaNumeric(10);
-		ServiceGroupGrid grid = page.getGrid();
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		ServiceMetadataPopup metadataPopup = row0.clickAddMetadata();
-		soft.assertTrue(!metadataPopup.isParticipantIdentifierEnabled(), "participantId field is enabled for an existing service group in service metadata popup");
-		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(), "participantScheme field is enabled for an existing service group in service metadata popup");
-		metadataPopup.fillForm(generator, generator, generator);
-		ServiceMetadataWizardPopup metadataWizard = metadataPopup.clickMetadataWizard();
-		soft.assertEquals(metadataWizard.docIDFieldValue(), generator, "document identifier field of metdata wizard popup not contain the corresponding doc id filled in sevice metadata popup");
-		soft.assertEquals(metadataWizard.docIDSchemeFieldValue(), generator, "document identifier field of metdata wizard popup not contain the corresponding doc id scheme filled in sevice metadata popup");
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-130")
-	public void verifyTransportProfile() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-		String generator = Generator.randomAlphaNumeric(10);
-		ServiceGroupGrid grid = page.getGrid();
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		ServiceMetadataPopup metadataPopup = row0.clickAddMetadata();
-		soft.assertTrue(!metadataPopup.isParticipantIdentifierEnabled(), "participantId field is enabled for an existing service group in service metadata popup");
-		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(), "participantScheme field is enabled for an existing service group in service metadata popup");
-		ServiceMetadataWizardPopup metadataWizard = metadataPopup.clickMetadataWizard();
-		soft.assertEquals(metadataWizard.transportProfileFieldContent(), "bdxr-transport-ebms3-as4-v1p0", "The transport profile field in service metadata wizard popup not contain the default value");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-140")
-	public void serviceMetadataXMLValidationRule() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-		String generator = Generator.randomAlphaNumeric(10);
-		ServiceGroupGrid grid = page.getGrid();
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		ServiceMetadataPopup metadataPopup = row0.clickAddMetadata();
-		metadataPopup.fillForm(generator, generator, generator);
-		metadataPopup.clickValidateBtn();
-		soft.assertEquals(metadataPopup.getXMLValidationMessage(), SMPMessages.VALID_XML_MESSAGE, "The message is not in list");
-		metadataPopup.clickClearBtn();
-		metadataPopup.clickValidateBtn();
-		soft.assertEquals(metadataPopup.getXMLValidationMessage(), SMPMessages.EMPTY_XML_WARN_MESSAGE, "The message is not in list");
-		metadataPopup.clickGenerateXMLBtn();
-		String xml1 = metadataPopup.captureTextOfMetadataTextArea();
-		String invalidxml1 = xml1 + "xcvjdvxv";
-		metadataPopup.addTextToMetadataTextArea(invalidxml1);
-		metadataPopup.clickValidateBtn();
-		soft.assertEquals(metadataPopup.getXMLValidationMessage(), SMPMessages.INVALID_XML_MESSAGE3, "The message error message is not in list");
-		metadataPopup.clickClearBtn();
-		metadataPopup.addTextToMetadataTextArea("xjvnkcfjblcf");
-		metadataPopup.clickValidateBtn();
-		soft.assertEquals(metadataPopup.getXMLValidationMessage(), SMPMessages.INVALID_XML_MESSAGE2, "The message error message is not in list");
-		metadataPopup.clickClearBtn();
-
-		soft.assertAll();
-
-	}
-
-	@Test(description = "EDT-150")
-	public void verifyServiceMetadataXMLClearBtn() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-		String generator = Generator.randomAlphaNumeric(10);
-		ServiceGroupGrid grid = page.getGrid();
-		Integer index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		ServiceMetadataPopup metadataPopup = row0.clickAddMetadata();
-		metadataPopup.fillForm(generator, generator, generator);
-		soft.assertNotEquals(metadataPopup.xmlFieldVALUE(), "", "The xml field area is empty");
-		metadataPopup.clickClearBtn();
-		soft.assertEquals(metadataPopup.xmlFieldVALUE(), "", "The clear button did not clear the xml field");
-		soft.assertAll();
-	}
-
-	@Test(description = "EDT-160")
-	public void verifyServiceMetadataWizardOkBtn() {
-		SoftAssert soft = new SoftAssert();
-		EditPage page = new EditPage(driver);
-		String generator = Generator.randomAlphaNumeric(10);
-		ServiceGroupGrid grid = page.getGrid();
-		grid.waitForRowsToLoad();
-		int index = 0;
-		ServiceGroupRowE row0 = grid.getRowsAs(ServiceGroupRowE.class).get(index);
-		ServiceMetadataPopup metadataPopup = row0.clickAddMetadata();
-		soft.assertTrue(!metadataPopup.isParticipantIdentifierEnabled(), "participantId field is enabled for an existing service group in service metadata popup");
-		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(), "participantScheme field is enabled for an existing service group in service metadata popup");
-
-
-		ServiceMetadataWizardPopup metadataWizard = metadataPopup.clickMetadataWizard();
-
-		soft.assertFalse(metadataWizard.isEnabledOkBtn(), "OK button is enabled before providing the valid data");
-		metadataWizard.fillForm(generator, generator, generator, generator, "bdxr-transport-ebms3-as4-v1p0", "internal/rest/domain");
-		metadataWizard.fillCerificateBox(generator);
-		soft.assertTrue(metadataWizard.isEnabledOkBtn(), "OK button is disabled after providing the valid data");
-
-		soft.assertAll();
-
-	}
-
-
-	private int scrollToSG(String pi) {
-		EditPage page = new EditPage(driver);
-		page.pagination.skipToFirstPage();
-
-		boolean end = false;
-		while (!end) {
-			page = new EditPage(driver);
-
-			List<ServiceGroupRow> rows = page.getGrid().getRows();
-			for (int i = 0; i < rows.size(); i++) {
-				if (rows.get(i).getParticipantIdentifier().equalsIgnoreCase(pi)) {
-					return i;
-				}
-			}
-
-			if (page.pagination.hasNextPage()) {
-				page.pagination.goToNextPage();
-			} else {
-				end = true;
-			}
-		}
-
-		return -1;
-	}
-
-}
diff --git a/smp-ui-tests/src/test/java/ui/LoginPgTest.java b/smp-ui-tests/src/test/java/ui/LoginPgTest.java
deleted file mode 100644
index db5617e0c6e191f9c535e22a77e0bad37c01826d..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/LoginPgTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package ui;
-
-import org.openqa.selenium.JavascriptExecutor;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.baseComponents.SMPPage;
-import pages.components.messageArea.AlertMessage;
-import pages.login.LoginPage;
-import pages.password.PasswordChangepopup;
-import pages.service_groups.search.SearchPage;
-import pages.users.UsersPage;
-import utils.Generator;
-import utils.enums.SMPMessages;
-import utils.rest.SMPRestClient;
-
-import java.util.HashMap;
-
-public class LoginPgTest extends BaseTest {
-
-
-	@AfterMethod
-	public void logoutAndReset() {
-
-		logger.info("deleting cookies");
-		driver.manage().deleteAllCookies();
-
-		try {
-			logger.info("clearing localstorage");
-			((JavascriptExecutor) driver).executeScript("localStorage.clear();");
-		} catch (Exception e) {
-			logger.info("clearing localcstorage failed");
-		}
-
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("refreshing page to close all popups");
-		page.refreshPage();
-
-		try {
-			if (page.pageHeader.sandwichMenu.isLoggedIn()) {
-				logger.info("Logout!!");
-				page.pageHeader.sandwichMenu.logout();
-			}
-			logger.info("Going to Search page");
-			page.sidebar.goToPage(SearchPage.class);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Test(description = "LGN-0")
-	public void loginPageNavigation() {
-
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-		LoginPage loginPage = new LoginPage(driver);
-
-		logger.info("Checking that login page is loaded correctly!");
-		soft.assertTrue(loginPage.isLoaded(), "Login page elements are loaded!");
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "LGN-10")
-	public void loginPageBuildNumberTest() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		logger.info("Check that the area for the build version is not empty");
-		soft.assertFalse(loginPage.getListedSMPVersion().isEmpty(), "Check that there is something in the build number area");
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "LGN-20")
-	public void loginPageDisplayTest() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-
-		soft.assertTrue(loginPage.isLoaded());
-
-		soft.assertTrue(loginPage.getTextInPasswordInput().isEmpty(), "User input is empty by default");
-		soft.assertTrue(loginPage.getTextInUsernameInput().isEmpty(), "Password input is empty by default");
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is visible");
-
-		soft.assertFalse(loginPage.sidebar.isEditLnkEnabled(), "Edit link is not visible");
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is not visible");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is not visible");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "LGN-30")
-	public void successfulLogin() {
-		SoftAssert soft = new SoftAssert();
-
-		String username = Generator.randomAlphaNumeric(10);
-		SMPRestClient.createUser(username, "SYSTEM_ADMIN");
-		logger.info("created user " + username);
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		logger.info("trying to login with " + username);
-		LoginPage loginPage = new LoginPage(driver);
-		SearchPage searchPage = loginPage.login(username, "QW!@qw12");
-
-		soft.assertTrue(searchPage.pageHeader.sandwichMenu.isLoggedIn(), "User is logged in");
-		soft.assertTrue(searchPage.isLoaded(), "Search page is loaded");
-
-		soft.assertAll();
-	}
-
-
-	//	Tests that using invalid credentials leads to proper error message
-	@Test(description = "LGN-40")
-	public void unsuccessfulLogin() {
-		SoftAssert soft = new SoftAssert();
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-
-		loginPage.invalidLogin("invalidUsername", "nonexistentPassword");
-
-		AlertMessage message = loginPage.alertArea.getAlertMessage();
-		soft.assertTrue(message.isError(), "Check message is error message");
-		soft.assertEquals(message.getMessage(), SMPMessages.MSG_1, "Check the error message content");
-
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is still available in the sidebar");
-		soft.assertFalse(loginPage.sidebar.isEditLnkEnabled(), "Edit link is NOT available in the sidebar");
-
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is NOT available in the sidebar");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is NOT available in the sidebar");
-
-
-		soft.assertAll();
-	}
-
-	@Test(description = "LGN-60")
-	public void loginButtonDisableVerification() {
-		SoftAssert soft = new SoftAssert();
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		LoginPage loginPage = page.pageHeader.goToLogin();
-		loginPage.loginWithoutUserAndPassword();
-		soft.assertTrue(loginPage.isLoginButtonEnable(), "login button is enabled");
-		soft.assertAll();
-	}
-
-	@Test(description = "LGN-70")
-	public void verifyMenuButtonMsg() {
-		SoftAssert soft = new SoftAssert();
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		LoginPage loginPage = page.pageHeader.goToLogin();
-		soft.assertFalse(loginPage.pageHeader.sandwichMenu.isLoggedIn(), "Menu does not contain the message 'Not logged in'");
-		soft.assertAll();
-	}
-
-	@Test(description = "LGN-80")
-	public void verifyLoginButtonEnable() {
-		SoftAssert soft = new SoftAssert();
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		LoginPage loginPage = page.pageHeader.goToLogin();
-		HashMap<String, String> user = testDataProvider.getUserWithRole("SYS_ADMIN");
-		loginPage.fillLoginInput(user.get("username"), user.get("password"));
-		soft.assertFalse(loginPage.isLoginButtonEnable(), "Login Button Is Disabled");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "LGN-90")
-	public void verifyRoleAfterLogin() {
-		SoftAssert soft = new SoftAssert();
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		HashMap<String, String> user = testDataProvider.getUserWithRole("SYS_ADMIN");
-		SearchPage searchPage = loginPage.login(user.get("username"), user.get("password"));
-		soft.assertTrue(searchPage.pageHeader.sandwichMenu.isLoggedIn(), "User is logged in");
-		String roleName = page.pageHeader.getRoleName();
-		soft.assertEquals(roleName, "System administrator", "the role doesn't contain System administrator");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "LGN-100")
-	public void loggedUserPasswordDialogView() {
-		SoftAssert soft = new SoftAssert();
-
-
-		String username = Generator.randomAlphaNumeric(10);
-		SMPRestClient.createUser(username, "SYSTEM_ADMIN");
-		logger.info("created user " + username);
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-
-		logger.info("trying to login with " + username);
-		LoginPage loginPage = new LoginPage(driver);
-		SearchPage searchPage = loginPage.login(username, "QW!@qw12");
-
-		soft.assertTrue(searchPage.pageHeader.sandwichMenu.isLoggedIn(), "User is not logged in");
-		soft.assertTrue(searchPage.isLoaded(), "Search page is not loaded");
-
-		PasswordChangepopup passPopup = searchPage.pageHeader.sandwichMenu.clickChangePasswordOption();
-		soft.assertTrue(passPopup.isCurrentPasswordInputEnable(), "Current password input is not enabled in the password dialog for logged user");
-		soft.assertTrue(passPopup.isNewPasswordInputEnable(), "New password input is not enabled in the password dialog for logged user");
-		soft.assertTrue(passPopup.isConfirmPasswordInputEnable(), "Confirm password input is not enabled in the password dialog for logged user");
-
-		searchPage = passPopup.clickClosePasswordDialog();
-
-		soft.assertAll();
-
-	}
-
-
-	@Test(description = "LGN-100")
-	public void passwordChangeForLoggedUser() {
-		SoftAssert soft = new SoftAssert();
-		String userName = Generator.randomAlphaNumeric(10);
-		String validPass = "Aabcdefghijklm1@";
-
-		SMPPage page = genericLoginProcedure("SYS_ADMIN");
-		SMPRestClient.createUser(userName, "SMP_ADMIN");
-		logger.info("created user " + userName);
-		page.pageHeader.sandwichMenu.logout();
-		page.pageHeader.goToLogin();
-		LoginPage loginPage = new LoginPage(driver);
-		SearchPage searchPage = loginPage.login(userName, "QW!@qw12");
-		PasswordChangepopup passDialog = searchPage.pageHeader.sandwichMenu.clickChangePasswordOption();
-
-		passDialog.waitForXMillis(1000);
-
-		passDialog.fillDataForLoggedUser("QW!@qw12", validPass, validPass);
-		passDialog.clickChangedPassword();
-		searchPage = passDialog.clickCloseAfterChangedPassForLoggedUser();
-
-		passDialog.waitForXMillis(1000);
-
-		soft.assertTrue(searchPage.isLoaded(), "After changing the password for a logged user the page is not redirecting to searchpage");
-		SMPPage page1 = genericLoginProcedure("SYS_ADMIN");
-		logger.info("Going to Users page");
-		page1.sidebar.goToPage(UsersPage.class);
-		UsersPage usersPage = new UsersPage(driver);
-		soft.assertTrue(usersPage.grid().isUserListed(userName), "User is not present in the page after changing the password");
-
-		soft.assertAll();
-
-	}
-}
\ No newline at end of file
diff --git a/smp-ui-tests/src/test/java/ui/PrivilegesTests.java b/smp-ui-tests/src/test/java/ui/PrivilegesTests.java
deleted file mode 100644
index 47cc2374e7246b6053838810f3a9e71570da2352..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/PrivilegesTests.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package ui;
-
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.baseComponents.SMPPage;
-import pages.service_groups.edit.EditPage;
-import pages.service_groups.edit.ServiceGroupPopup;
-import pages.login.LoginPage;
-import pages.service_groups.search.SearchPage;
-import utils.Generator;
-import utils.rest.SMPRestClient;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
-public class PrivilegesTests extends BaseTest {
-
-
-	@AfterMethod
-	public void logoutAndReset(){
-		genericLogoutProcedure();
-	}
-
-	@Test(description = "RGT-0")
-	public void anonymousUserRights(){
-		logger.info("Checking rights for anonymous user");
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-
-		soft.assertTrue(page.sidebar.isSearchLnkEnabled(), "Search link is visible on Search page");
-		soft.assertFalse(page.sidebar.isEditLnkEnabled(), "Edit link is NOT visible on Search page");
-		soft.assertFalse(page.sidebar.isDomainLnkEnabled(), "Domain link is NOT visible on Search page");
-		soft.assertFalse(page.sidebar.isUsersLnkEnabled(), "Users link is NOT visible on Search page");
-
-		logger.info("Going to the login page");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is visible on Login page");
-		soft.assertFalse(loginPage.sidebar.isEditLnkEnabled(), "Edit link is NOT visible on Login page");
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is NOT visible on Login page");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is NOT visible on Login page");
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "RGT-10")
-	public void sg_adminRights(){
-
-		String pi = Generator.randomAlphaNumeric(10);
-		String ps = Generator.randomAlphaNumeric(10);
-
-		SMPRestClient.createServiceGroup(pi, ps,
-				new ArrayList<>(Arrays.asList("user")),
-				new ArrayList<>(Arrays.asList(createdDomains.get(0)))
-		);
-
-		logger.info("Checking rights for SG_ADMIN user");
-		SoftAssert soft = new SoftAssert();
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("going to login");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		HashMap<String, String> user = testDataProvider.getUserWithRole("SG_ADMIN");
-
-		logger.info("Logging in with user " + user.get("username"));
-		loginPage.login(user.get("username"), user.get("password"));
-
-		soft.assertTrue(loginPage.pageHeader.sandwichMenu.isLoggedIn(), "Check that the user is logged in");
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is visible after login for SG_ADMIN");
-		soft.assertTrue(loginPage.sidebar.isEditLnkEnabled(), "Edit link is visible after login for SG_ADMIN");
-
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is NOT visible after login for SG_ADMIN");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is NOT visible after login for SG_ADMIN");
-
-//		going to check privileges on Edit page for SG_ADMIN
-		logger.info("Going to edit page");
-		EditPage editPage = loginPage.sidebar.goToPage(EditPage.class);
-		soft.assertFalse(editPage.isNewButtonPresent(), "New button should not be present for SG_ADMIN");
-		soft.assertFalse(editPage.isDeleteButtonPresent(), "Delete button should not be present for SG_ADMIN");
-
-		logger.info("opening service group popup");
-		editPage.getGrid().doubleClickRow(0);
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-
-		soft.assertFalse(popup.isDomainsPanelEnabled(), "SG_ADMIN cannot edit a service groups DOMAINS");
-		soft.assertFalse(popup.isOwnersPanelPresent(), "SG_ADMIN cannot edit a service groups OWNERS");
-		popup.clickCancel();
-
-		logger.info("LOGOUT");
-		loginPage.pageHeader.sandwichMenu.logout();
-
-		soft.assertFalse(loginPage.pageHeader.sandwichMenu.isLoggedIn(), "Check that the user is logged out");
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is visible after logout");
-		soft.assertFalse(loginPage.sidebar.isEditLnkEnabled(), "Edit link is NOT visible after logout");
-
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is NOT visible after logout");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is NOT visible after logout");
-
-		SMPRestClient.deleteSG(pi);
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "RGT-20")
-	public void sys_adminRights(){
-		SoftAssert soft = new SoftAssert();
-
-		SMPPage page = new SMPPage(driver);
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		HashMap<String, String> user = testDataProvider.getUserWithRole("SYS_ADMIN");
-		loginPage.login(user.get("username"), user.get("password"));
-
-		soft.assertTrue(loginPage.pageHeader.sandwichMenu.isLoggedIn());
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled());
-		soft.assertFalse(loginPage.sidebar.isEditLnkEnabled());
-
-		soft.assertTrue(loginPage.sidebar.isDomainLnkEnabled());
-		soft.assertTrue(loginPage.sidebar.isUsersLnkEnabled());
-
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "RGT-30")
-	public void smp_adminRights(){
-		logger.info("Checking rights for SMP_ADMIN user");
-		SoftAssert soft = new SoftAssert();
-
-		SMPPage page = new SMPPage(driver);
-		logger.info("going to login");
-		page.pageHeader.goToLogin();
-
-		LoginPage loginPage = new LoginPage(driver);
-		HashMap<String, String> user = testDataProvider.getUserWithRole("SMP_ADMIN");
-
-		logger.info("Logging in with user " + user.get("username"));
-		loginPage.login(user.get("username"), user.get("password"));
-
-		soft.assertTrue(loginPage.pageHeader.sandwichMenu.isLoggedIn(), "Check that the user is logged in");
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is visible after login for SMP_ADMIN");
-		soft.assertTrue(loginPage.sidebar.isEditLnkEnabled(), "Edit link is visible after login for SMP_ADMIN");
-
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is NOT visible after login for SMP_ADMIN");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is NOT visible after login for SMP_ADMIN");
-
-//		going to check privileges on Edit page for SMP_ADMIN
-		logger.info("Going to edit page");
-		EditPage editPage = loginPage.sidebar.goToPage(EditPage.class);
-		soft.assertTrue(editPage.isNewButtonPresent(), "New button should be present for SMP_ADMIN");
-		soft.assertTrue(editPage.isDeleteButtonPresent(), "Delete button should be present for SMP_ADMIN");
-
-		logger.info("opening service group popup");
-		editPage.getGrid().doubleClickRow(0);
-		ServiceGroupPopup popup = new ServiceGroupPopup(driver);
-
-		soft.assertTrue(popup.isDomainsPanelEnabled(), "SMP_ADMIN should be able to edit a service groups DOMAINS");
-		soft.assertTrue(popup.isOwnersPanelEnabled(), "SMP_ADMIN should be able to edit a service groups OWNERS");
-		popup.clickCancel();
-
-		logger.info("LOGOUT");
-		loginPage.pageHeader.sandwichMenu.logout();
-
-		soft.assertFalse(loginPage.pageHeader.sandwichMenu.isLoggedIn(), "Check that the user is logged out");
-
-		soft.assertTrue(loginPage.sidebar.isSearchLnkEnabled(), "Search link is visible after logout");
-		soft.assertFalse(loginPage.sidebar.isEditLnkEnabled(), "Edit link is NOT visible after logout");
-
-		soft.assertFalse(loginPage.sidebar.isDomainLnkEnabled(), "Domain link is NOT visible after logout");
-		soft.assertFalse(loginPage.sidebar.isUsersLnkEnabled(), "Users link is NOT visible after logout");
-
-		soft.assertAll();
-	}
-
-
-}
diff --git a/smp-ui-tests/src/test/java/ui/PropertiesPgTest.java b/smp-ui-tests/src/test/java/ui/PropertiesPgTest.java
deleted file mode 100644
index 5ac66daa0c0f9040ef95a33f747d727277f1aae5..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/PropertiesPgTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package ui;
-
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.baseComponents.SMPPage;
-import pages.properties.PropertiesPage;
-import pages.properties.PropertyPopup;
-import pages.properties.PropertyRowInfo;
-import pages.service_groups.edit.EditPage;
-import pages.service_groups.edit.ServiceGroupPopup;
-import pages.service_groups.search.SearchPage;
-import utils.Generator;
-import utils.enums.SMPMessages;
-
-public class PropertiesPgTest extends BaseTest {
-	@AfterMethod
-	public void logoutAndReset() {
-		genericLogoutProcedure();
-	}
-
-
-	@BeforeMethod
-	public void loginAndGoToDomainPage() {
-
-		SMPPage page = genericLoginProcedure("SYS_ADMIN");
-
-		logger.info("Going to Property page");
-		page.sidebar.goToPage(PropertiesPage.class);
-	}
-
-	/*@Test(description = "PROP-0")*/
-	@Test(description = "PROP-0", enabled = false)
-	public void verifyParticipantschemeMandatoryProperty() {
-
-		SoftAssert soft = new SoftAssert();
-		String property = "identifiersBehaviour.scheme.mandatory";
-
-		PropertiesPage propertiesPage = new PropertiesPage(driver);
-		propertiesPage.propertySearch(property);
-		soft.assertTrue(propertiesPage.grid().rowContainPropertyName(property), "The row does not contain the searching property");
-		PropertyRowInfo newRow0 = propertiesPage.grid().getRows().get(0);
-
-		if (newRow0.getPropertyvalue().equals("true")) {
-			propertiesPage.grid().selectRow(0);
-			PropertyPopup popup = propertiesPage.clickEdit();
-			propertiesPage = popup.disableCheckboxOfProperty();
-			soft.assertTrue(propertiesPage.isSaveButtonEnabled(), "Save button is disbled");
-			propertiesPage.clickSave().confirm();
-			soft.assertTrue(propertiesPage.alertArea.getAlertMessage().isError(), "Message listed is success");
-			soft.assertTrue(propertiesPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is not listed is as expected");
-		}
-
-		propertiesPage.pageHeader.sandwichMenu.logout();
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		page.pageHeader.goToLogin();
-		SMPPage smpPage = genericLoginProcedure("SMP_ADMIN");
-		smpPage.sidebar.goToPage(EditPage.class);
-		EditPage editPage = new EditPage(driver);
-		ServiceGroupPopup servicePopup = editPage.clickNew();
-		soft.assertTrue(servicePopup.isParticipantIdentifierInputEnabled(), "Participant Identifier field is disabled");
-		soft.assertTrue(servicePopup.isParticipantSchemeInputEnabled(), "Participant Scheme field is disabled");
-		soft.assertTrue(servicePopup.isOwnersPanelEnabled(), "Owners panel is enabled");
-		soft.assertTrue(servicePopup.isDomainsPanelEnabled(), "Domain panel is enabled");
-		servicePopup.fillParticipantIdentifier("sonbrat1223");
-		servicePopup.chooseFirstOwner();
-		servicePopup.chooseFirstDomain();
-
-		soft.assertTrue(servicePopup.isOKButtonEnable(), "Ok button is not enabled after creating servicegroup without scheme");
-		soft.assertTrue(servicePopup.isCancelButtonEnable(), "cancel button is not enabled after creating servicegroup without scheme");
-
-		servicePopup.clickOK();
-
-		soft.assertTrue(editPage.isSaveButtonEnabled(), "Save button is not enabled after cration of servicegroup without scheme");
-		soft.assertTrue(editPage.isCancelButtonEnabled(), "Cancel button is not enabled after cration of servicegroup without scheme");
-		editPage.clickSave().confirm();
-		;
-
-		soft.assertTrue(editPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is not listed is as expected");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "PROP-10")
-	public void smpAlertPasswordExpiredMailSubjectAllowString() {
-		SoftAssert soft = new SoftAssert();
-		String property = "smp.alert.password.expired.mail.subject";
-		String string = Generator.randomAlphaNumeric(10);
-
-		PropertiesPage propertiesPage = new PropertiesPage(driver);
-		propertiesPage.propertySearch(property);
-		soft.assertTrue(propertiesPage.grid().rowContainPropertyName(property), "The row does not contain the searching property");
-		int index = 0;
-		propertiesPage.grid().selectRow(index);
-		PropertyPopup popup = propertiesPage.clickEdit();
-		String sentence = " ";
-		for (int i = 0; i < 26; i++) {
-			sentence = sentence + string;
-		}
-		popup.editInputField(sentence);
-		popup.clickOK();
-		soft.assertTrue(propertiesPage.getErrorMessage().equalsIgnoreCase(SMPMessages.MSG_23), "the errors message is not showing");
-		popup.clickCancel();
-		soft.assertAll();
-	}
-}
diff --git a/smp-ui-tests/src/test/java/ui/SearchPgTest.java b/smp-ui-tests/src/test/java/ui/SearchPgTest.java
deleted file mode 100644
index 93f2618e8f358efef844e5e259687d65d8e6d11a..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/SearchPgTest.java
+++ /dev/null
@@ -1,391 +0,0 @@
-package ui;
-
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Ignore;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.baseComponents.SMPPage;
-import pages.service_groups.MetadataGrid;
-import pages.service_groups.MetadataRow;
-import pages.service_groups.ServiceGroupRow;
-import pages.service_groups.search.SearchPage;
-import pages.service_groups.search.pojo.ServiceGroup;
-import utils.Generator;
-import utils.rest.SMPRestClient;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-public class SearchPgTest extends BaseTest {
-
-	@AfterMethod
-	public void resetFilters() {
-		SMPPage page = new SMPPage(driver);
-		page.refreshPage();
-		page.waitForXMillis(500);
-
-	}
-
-	@Test(description = "SRCH-0")
-	public void searchPgInitialState() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-		soft.assertTrue(page.filters.isSearchButtonVisible(), "Search button is not visible");
-		soft.assertTrue(page.filters.isSearchButtonEnable(), "Search button is not enabled");
-		soft.assertTrue(page.filters.getParticipantIdentifierInputValue().isEmpty());
-		soft.assertTrue(page.filters.getParticipantSchemeInputValue().isEmpty());
-		soft.assertEquals(page.filters.domainSelect.getSelectedValue(), "All Domains");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-10")
-	public void domainSelectContent() {
-		SoftAssert soft = new SoftAssert();
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		List<String> uiDomains = page.filters.domainSelect.getOptionTexts();
-		List<String> restDomains = SMPRestClient.getDomainAndSubdomains();
-
-		for (String restDomain : restDomains) {
-			boolean found = false;
-			for (String uiDomain : uiDomains) {
-				if (uiDomain.equalsIgnoreCase(restDomain)) {
-					found = true;
-				}
-			}
-			soft.assertTrue(found, "Domain was found in domain dropdown " + restDomain);
-		}
-
-		soft.assertAll();
-
-	}
-
-	@Test(description = "SRCH-20")
-	public void searchGridInitialState() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		List<String> headers = page.getServiceGroupGrid().getHeaders();
-		soft.assertTrue(headers.contains("Participant identifier"));
-		soft.assertTrue(headers.contains("Participant scheme"));
-		soft.assertTrue(headers.contains("OASIS ServiceGroup URL"));
-		soft.assertTrue(headers.contains("Metadata size"));
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-30")
-	public void searchFilterResults() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		ServiceGroupRow row0 = page.getServiceGroupGrid().getRows().get(0);
-		String pScheme = row0.getParticipantScheme();
-		String pIdentifier = row0.getParticipantIdentifier();
-
-//		looking for exact match
-		page.filters.filter(pIdentifier, pScheme, "");
-
-		List<ServiceGroupRow> rows = page.getServiceGroupGrid().getRows();
-
-		for (ServiceGroupRow row : rows) {
-			soft.assertTrue(row.getParticipantIdentifier().contains(pIdentifier));
-			soft.assertTrue(row.getParticipantScheme().contains(pScheme));
-		}
-
-//		Search for substring
-		page.filters.filter(pIdentifier.substring(2), pScheme.substring(2), "");
-		rows = page.getServiceGroupGrid().getRows();
-
-		for (ServiceGroupRow row : rows) {
-
-			String identifier = row.getParticipantIdentifier();
-			String scheme = row.getParticipantScheme();
-
-			soft.assertTrue(identifier.contains(pIdentifier), String.format("Identifier %s, found %s", pIdentifier, identifier));
-			soft.assertTrue(scheme.contains(pScheme), String.format("Scheme %s, found %s", pScheme, scheme));
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-40")
-	public void openURLLink() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		ServiceGroupRow row0 = page.getServiceGroupGrid().getRows().get(0);
-		String listedURL = row0.getServiceGroupURL();
-		String pScheme = row0.getParticipantScheme();
-		String pIdentifier = row0.getParticipantIdentifier();
-
-//		verify proper URL format
-		String tmpURLPart = null;
-		try {
-			tmpURLPart = URLDecoder.decode(listedURL, "UTF-8").split("smp/")[1].trim();
-			soft.assertEquals(tmpURLPart, pScheme + "::" + pIdentifier, "URL contains the proper scheme and identifier");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-
-		ServiceGroup serviceGroup = SMPRestClient.getServiceGroup(listedURL);
-
-		soft.assertTrue(row0.getMetadataSize() == serviceGroup.getServiceMetadataReferenceCollection().size(),
-				"Number of listed MetadataReferences in XML matches UI");
-
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "SRCH-50")
-	@Ignore
-	public void expandServiceGroupCheckMetadata() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		ServiceGroupRow row0 = page.getServiceGroupGrid().getRows().get(0);
-		String listedURL = row0.getServiceGroupURL();
-		String pScheme = row0.getParticipantScheme();
-		String pIdentifier = row0.getParticipantIdentifier();
-
-//		verify proper URL format
-		ServiceGroup serviceGroup = SMPRestClient.getServiceGroup(listedURL);
-
-		MetadataGrid metadataGrid = row0.expandMetadata();
-
-		List<MetadataRow> metadataRows = metadataGrid.getMetadataRows();
-
-		soft.assertTrue(row0.getMetadataSize() == metadataRows.size(), "Metadata size field compared with the size of the list containing the metadata");
-
-		for (MetadataRow metadataRow : metadataRows) {
-			String docScheme = metadataRow.getDocumentIdentifierScheme();
-			String docId = metadataRow.getDocumentIdentifier();
-			String url = metadataRow.getURL();
-
-			soft.assertTrue(url.contains(String.format("%s::%s/services/%s::%s", pScheme, pIdentifier, docScheme, docId)), "Checking URL format for metadata " + docId);
-
-
-			String metadata = SMPRestClient.getMetadataString(url);
-
-			soft.assertTrue(metadata.contains(pScheme), "Checking XML contains proper participant scheme for metadata " + docId);
-			soft.assertTrue(metadata.contains(pIdentifier), "Checking XML contains proper participant ID for metadata " + docId);
-			soft.assertTrue(metadata.toLowerCase().contains(docId.toLowerCase()), "Checking XML contains proper document ID for metadata " + docId);
-			soft.assertTrue(metadata.contains(docScheme), "Checking XML contains proper document scheme for metadata " + docId);
-
-
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-60")
-	public void collapseMetadata() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		ServiceGroupRow row0 = null;
-		List<ServiceGroupRow> rows = page.getServiceGroupGrid().getRows();
-		for (int i = 0; i < rows.size(); i++) {
-			if (rows.get(i).getMetadataSize() > 0) {
-				row0 = rows.get(i);
-			}
-		}
-
-		if (null == row0) {
-			row0 = rows.get(0);
-			SMPRestClient.createMetadata(row0.getParticipantIdentifier());
-			page.refreshPage();
-			logger.info("Created Metadata for row 0");
-			row0 = page.getServiceGroupGrid().getRows().get(0);
-		}
-
-
-		soft.assertTrue(row0.verifyMetadataExpandButton(), "Initially the row has expanding symbol on it");
-		row0.expandMetadata();
-
-		soft.assertTrue(row0.verifyMetadataCollapseButton(), "Row has collapsing symbol on it after first click");
-
-		row0.collapseMetadata();
-		soft.assertTrue(row0.verifyMetadataExpandButton(), "Row has expanding symbol on it after collapse");
-		soft.assertFalse(row0.isMetadataExpanded(), "Metadata table is not present no more");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-70")
-	public void verifyOpenMetadataURL() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-
-		ServiceGroupRow row0 = null;
-		List<ServiceGroupRow> rows = page.getServiceGroupGrid().getRows();
-		for (int i = 0; i < rows.size(); i++) {
-			if (rows.get(i).getMetadataSize() > 0) {
-				row0 = rows.get(i);
-			}
-		}
-
-		if (null == row0) {
-			row0 = rows.get(0);
-			SMPRestClient.createMetadata(row0.getParticipantIdentifier());
-			page.refreshPage();
-			logger.info("Created Metadata for row 0");
-			row0 = page.getServiceGroupGrid().getRows().get(0);
-		}
-
-		String listedURL = row0.getServiceGroupURL();
-		String pScheme = row0.getParticipantScheme();
-		String pIdentifier = row0.getParticipantIdentifier();
-
-//		verify proper URL format
-		ServiceGroup serviceGroup = SMPRestClient.getServiceGroup(listedURL);
-
-		MetadataGrid metadataGrid = row0.expandMetadata();
-
-		List<MetadataRow> metadataRows = metadataGrid.getMetadataRows();
-
-		soft.assertTrue(row0.getMetadataSize() == metadataRows.size(), "Metadata size field compared with the size of the list containing the metadata");
-
-		for (MetadataRow metadataRow : metadataRows) {
-			String docScheme = metadataRow.getDocumentIdentifierScheme();
-			String docId = metadataRow.getDocumentIdentifier();
-			String url = null;
-			try {
-				url = URLDecoder.decode(metadataRow.getURL(), "UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-
-			soft.assertTrue(url.contains(String.format("%s::%s/services/%s::%s", pScheme, pIdentifier, docScheme, docId)), "Checking URL format for metadata " + docId);
-
-			String mainWindow = driver.getWindowHandle();
-
-			metadataRow.clickURL();
-			page.waitForNumberOfWindowsToBe(2);
-			Set<String> handleSet = driver.getWindowHandles();
-			String[] handles = handleSet.toArray(new String[handleSet.size()]);
-
-			soft.assertTrue(handles.length == 2);
-
-			driver.switchTo().window(handles[1]);
-			driver.close();
-			driver.switchTo().window(handles[0]);
-
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-80")
-	public void filterByDifferentDomains() {
-		SoftAssert soft = new SoftAssert();
-
-		String participantID = Generator.randomAlphaNumeric(5);
-		String tmp = Generator.randomAlphaNumeric(3).toLowerCase();
-		String participantScheme = String.format("%s-%s-%s", tmp, tmp, tmp);
-
-		List<String> domains = Arrays.asList(createdDomains.get(0), createdDomains.get(1));
-		List<String> owners = Arrays.asList(createdUsers.get(0));
-
-		logger.info("Creating service group with participant id: " + participantID);
-		SMPRestClient.createServiceGroup(participantID, participantScheme, owners, domains);
-
-		SearchPage searchPage = new SearchPage(driver);
-		searchPage.refreshPage();
-
-		searchPage.filters.filter(participantID, participantScheme, SMPRestClient.getDomainSubDomainCombo(createdDomains.get(0)));
-		List<ServiceGroupRow> results = searchPage.getServiceGroupGrid().getRows();
-
-		soft.assertEquals(results.size(), 1, "Results size is 1 (first search)");
-		soft.assertEquals(results.get(0).getParticipantIdentifier().toLowerCase(), participantID.toLowerCase(),
-				"First and only result is the one we entered and is found when filtering by first domain");
-
-
-		searchPage.filters.filter(participantID, participantScheme, SMPRestClient.getDomainSubDomainCombo(createdDomains.get(1)));
-		results = searchPage.getServiceGroupGrid().getRows();
-
-		soft.assertEquals(results.size(), 1, "Results size is 1 (second search)");
-		soft.assertEquals(results.get(0).getParticipantIdentifier().toLowerCase(), participantID.toLowerCase(),
-				"First and only result is the one we entered and is found when filtering by second domain");
-
-
-		SMPRestClient.deleteSG(participantID);
-
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-90")
-	public void verifyDifferentParticipantIdAndSchemeResult() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-		String emptyMsg = "No data to display";
-
-		ServiceGroupRow row0 = page.getServiceGroupGrid().getRows().get(0);
-		String pScheme = row0.getParticipantScheme();
-
-		ServiceGroupRow row1 = page.getServiceGroupGrid().getRows().get(1);
-		String pIdentifier = row1.getParticipantIdentifier();
-
-		page.filters.filter(pIdentifier, pScheme, "");
-
-		soft.assertEquals(page.getServiceGroupGrid().getEmptyTableText(), emptyMsg, "empty table not found");
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-100")
-	public void metadataTableContent() {
-		SoftAssert soft = new SoftAssert();
-
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-		ServiceGroupRow row0 = null;
-		List<ServiceGroupRow> rows = page.getServiceGroupGrid().getRows();
-		row0 = rows.get(0);
-		MetadataGrid metadataGrid = row0.expandMetadata();
-		List<MetadataRow> metadataRows = metadataGrid.getMetadataRows();
-		if (row0.getMetadataSize() == 0) {
-			//row0.emptyMetadataContentText()
-			soft.assertEquals(row0.emptyMetadataContentText(), "No service metadata");
-		} else {
-			if (row0.getMetadataSize() > 0) {
-				soft.assertTrue(row0.getMetadataSize() == metadataRows.size(), "metadata size is not equal to no of metadata present inside the corressponding row");
-			}
-
-		}
-		soft.assertAll();
-	}
-
-	@Test(description = "SRCH-101")
-	public void verifyCollapsingSidebarPageAfterLogin() {
-		SoftAssert soft = new SoftAssert();
-		SearchPage page = new SearchPage(driver);
-		soft.assertTrue(page.isLoaded());
-		page.sidebar.collapsingSideBar();
-		soft.assertFalse(page.sidebar.isSidebarSearchTextEnable(), "Search button is visible so sidebar page is not collpased");
-		page.sidebar.expandingSideBar();
-		soft.assertTrue(page.sidebar.isSidebarSearchTextEnable(), "Search button is not visible so sidebar page is not expanding");
-		soft.assertAll();
-	}
-}
diff --git a/smp-ui-tests/src/test/java/ui/UsersPgTest.java b/smp-ui-tests/src/test/java/ui/UsersPgTest.java
deleted file mode 100644
index 151763ef64b0e2dc51a1312967ad8ca35307306e..0000000000000000000000000000000000000000
--- a/smp-ui-tests/src/test/java/ui/UsersPgTest.java
+++ /dev/null
@@ -1,735 +0,0 @@
-package ui;
-
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-import pages.components.ConfirmationDialog;
-import pages.components.baseComponents.SMPPage;
-import pages.components.messageArea.AlertMessage;
-import pages.login.LoginPage;
-import pages.service_groups.search.SearchPage;
-import pages.users.UserPopup;
-import pages.users.UsersPage;
-import utils.Generator;
-import utils.TestDataProvider;
-import utils.enums.SMPMessages;
-import utils.rest.SMPRestClient;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class UsersPgTest extends BaseTest {
-
-
-	@AfterMethod
-	public void logoutAndReset() {
-		genericLogoutProcedure();
-	}
-
-
-	@BeforeMethod
-	public void loginAndGoToUsersPage() {
-
-		SMPPage page = genericLoginProcedure("SYS_ADMIN");
-
-		logger.info("Going to Users page");
-		page.sidebar.goToPage(UsersPage.class);
-	}
-
-	@Test(description = "USR-0")
-	public void existingUserPasswordDialogView() {
-		SoftAssert soft = new SoftAssert();
-		String username = Generator.randomAlphaNumeric(10);
-		String email = "system@gmail.com";
-		UsersPage usersPage = new UsersPage(driver);
-		UserPopup popup = usersPage.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
-		popup.fillDetailsForm(username, email);
-		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-		popup.clickOK();
-		soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled");
-		soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled");
-
-		usersPage.clickSave().confirm();
-
-		soft.assertTrue(!usersPage.alertArea.getAlertMessage().isError(), "Message listed is success");
-		soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
-
-		soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
-
-		int index = usersPage.grid().scrollToUser(username);
-
-		usersPage.grid().selectRow(index);
-		popup = usersPage.clickEdit();
-
-		popup.clickSetOrChangePassword();
-		soft.assertTrue(popup.isAdminPasswordInputEnable(), "Admin password field input is not enabled after open password change popup for an existing user");
-		soft.assertTrue(popup.isNewPasswordInputEnable(), "New password field input is not enabled after open password change popup for an existing user");
-		soft.assertTrue(popup.isConfirmPasswordInputEnable(), "Confirm password field input is not enabled after open password change popup for an existing user");
-
-		popup.clickClosePasswordDialog();
-		popup.clickOK();
-		usersPage.clickDelete();
-		usersPage.waitForXMillis(200);
-		soft.assertTrue(!usersPage.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
-		soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
-		soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
-
-		usersPage.clickSave().confirm();
-
-		soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is as expected");
-		soft.assertTrue(!usersPage.grid().isUserListed(username), "After saving deleted user is not listed");
-
-		soft.assertAll();
-
-	}
-
-
-	@Test(description = "USR-10")
-	public void newUser() {
-		String username = Generator.randomAlphaNumeric(10);
-		String validPass = "Aabcdefghijklm1@";
-		String email = "system@gmail.com";
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage usersPage = new UsersPage(driver);
-
-
-		UserPopup popup = usersPage.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
-		popup.fillDetailsForm(username, email);
-		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-		popup.clickOK();
-
-
-		soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled");
-		soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled");
-
-		usersPage.clickSave().confirm();
-
-		soft.assertTrue(!usersPage.alertArea.getAlertMessage().isError(), "Message listed is success");
-		soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
-
-		soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
-		String adminPass = "123456";
-		int index = usersPage.grid().scrollToUser(username);
-
-		usersPage.grid().selectRow(index);
-		popup = usersPage.clickEdit();
-		try {
-			Thread.sleep(10000);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		popup.clickSetOrChangePassword();
-		popup.setOrChangePassword(adminPass, validPass, validPass);
-		popup.clickChangedPassword();
-		popup.clickCloseAfterChangedPass();
-		try {
-			Thread.sleep(1000);
-		} catch (Exception e) {
-		}
-		popup.clickOK();
-		soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
-
-		soft.assertAll();
-	}
-
-
-	@Test(description = "USR-20")
-	public void usernameValidation() {
-		String username = Generator.randomAlphaNumeric(10);
-		String validPass = "QW!@qw12";
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage usersPage = new UsersPage(driver);
-		UserPopup popup = usersPage.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
-		popup.fillDetailsForm("tst", "smp@gmail.com");
-		popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
-
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(2)");
-		soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(2)");
-		popup.fillDetailsForm("#$^&*^%&$#@%@$#%$", "system@gmail.com");
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(3)");
-		soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(3)");
-		//noinspection SpellCheckingInspection
-		popup.fillDetailsForm("QWERQWERQWERQWERQWERQWERQWERQWE33", "system@gmail.com");
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup(4)");
-		soft.assertEquals(popup.getUsernameValidationError(), SMPMessages.USERNAME_VALIDATION_MESSAGE, "Validation error message is displayed(4)");
-
-
-		soft.assertAll();
-	}
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@Test(description = "USR-30")
-	public void passwordValidation() {
-		String username = Generator.randomAlphaNumeric(10);
-		String email = "system@gmail.com";
-		ArrayList<String> passToValidate = new ArrayList<>(Arrays.asList("qwqw",
-				"QWERQWERQWERQWERQWERQWERQWERQWE33"));
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage usersPage = new UsersPage(driver);
-		usersPage.clickVoidSpace();
-
-		UserPopup popup = usersPage.clickNew();
-		popup.fillDetailsForm(username, email);
-		popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
-		popup.clickOK();
-		usersPage.clickSave().confirm();
-		soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
-		int index = usersPage.grid().scrollToUser(username);
-		usersPage.grid().selectRow(index);
-		String adminPass = "123456";
-		for (String pass : passToValidate) {
-
-			popup = usersPage.clickEdit();
-
-			popup.clickSetOrChangePassword();
-			popup.setOrChangePassword(adminPass, pass, pass);
-			popup.clickClosePasswordDialog();
-			popup.clickCancel();
-
-			soft.assertTrue(!popup.isChangedPasswordActive(), String.format("ChangePassword button should be disabled until valid data is filled in the popup - %s ", pass));
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-40")
-	public void listedRoles() {
-
-		ArrayList<String> expectedRoleValues = new ArrayList<>(Arrays.asList("SYSTEM_ADMIN", "SMP_ADMIN", "SERVICE_GROUP_ADMIN"));
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage usersPage = new UsersPage(driver);
-		UserPopup popup = usersPage.clickNew();
-		List<String> listedRoles = popup.rolesSelect.getOptionTexts();
-
-		soft.assertTrue(expectedRoleValues.size() == listedRoles.size(), "Number of roles is the same as expected");
-
-		for (String expected : expectedRoleValues) {
-			boolean found = false;
-			for (String listedRole : listedRoles) {
-				if (listedRole.equalsIgnoreCase(expected)) {
-					found = true;
-				}
-			}
-			soft.assertTrue(found, "Role found in page " + expected);
-		}
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-50")
-	public void deleteSYS_ADMIN() {
-
-		String username = Generator.randomAlphaNumeric(10);
-		SMPRestClient.createUser(username, "SYSTEM_ADMIN");
-		SoftAssert soft = new SoftAssert();
-
-		logger.info("created user " + username);
-		UsersPage page = new UsersPage(driver);
-		page.refreshPage();
-
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-		soft.assertTrue(page.grid().isUserListed(username), "After canceling delete user is still listed");
-
-
-		index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
-
-		page.clickDelete();
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
-
-		page.clickSave().confirm();
-
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
-		soft.assertTrue(!page.grid().isUserListed(username), "After saving deleted user is not listed");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-60")
-	public void changeRoleSYS_ADMIN() {
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		int index = page.grid().scrollToUserWithRole("SYSTEM_ADMIN");
-
-		page.grid().selectRow(index);
-		UserPopup popup = page.clickEdit();
-		List<String> options = popup.rolesSelect.getOptionTexts();
-		soft.assertTrue(options.size() == 1, "Role dropdown has only one value");
-		soft.assertTrue(options.get(0).equalsIgnoreCase("SYSTEM_ADMIN"), "Role dropdown has only one value and that is \"SYSTEM_ADMIN\"");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-70")
-	public void changeRoleNON_SYS_ADMIN() {
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		int index = page.grid().scrollToUserWithRole("SMP_ADMIN");
-
-		page.grid().selectRow(index);
-		UserPopup popup = page.clickEdit();
-
-		List<String> options = popup.rolesSelect.getOptionTexts();
-		soft.assertTrue(options.size() == 2, "Role dropdown has only two values");
-		soft.assertTrue(options.get(0).equalsIgnoreCase("SMP_ADMIN"), "Role dropdown has value \"SMP_ADMIN\"");
-		soft.assertTrue(options.get(1).equalsIgnoreCase("SERVICE_GROUP_ADMIN"), "Role dropdown has value \"SERVICE_GROUP_ADMIN\"");
-		page.refreshPage();
-
-		int index2 = page.grid().scrollToUserWithRole("SERVICE_GROUP_ADMIN");
-
-		page.grid().selectRow(index2);
-		popup = page.clickEdit();
-
-		options = popup.rolesSelect.getOptionTexts();
-		soft.assertTrue(options.size() == 2, "Role dropdown has only two values");
-		soft.assertTrue(options.get(0).equalsIgnoreCase("SMP_ADMIN"), "Role dropdown has value \"SMP_ADMIN\"");
-		soft.assertTrue(options.get(1).equalsIgnoreCase("SERVICE_GROUP_ADMIN"), "Role dropdown has value \"SERVICE_GROUP_ADMIN\"");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-80")
-	public void deleteOWNUserRecord() {
-
-		String username = new TestDataProvider().getUserWithRole("SYS_ADMIN").get("username");
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		AlertMessage message = page.alertArea.getAlertMessage();
-		soft.assertTrue(message.isError(), "Listed message is error");
-		soft.assertTrue(message.getMessage().equalsIgnoreCase(SMPMessages.USER_OWN_DELETE_ERR), "Listed message has appropriate text");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-90")
-	public void deleteSMP_ADMIN() {
-
-		String username = Generator.randomAlphaNumeric(10);
-		SMPRestClient.createUser(username, "SMP_ADMIN");
-		SoftAssert soft = new SoftAssert();
-
-		logger.info("Created username " + username);
-
-
-		UsersPage page = new UsersPage(driver);
-		page.refreshPage();
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-		soft.assertTrue(page.grid().isUserListed(username), "After canceling delete user is still listed");
-
-
-		index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
-
-		page.clickDelete();
-		page.waitForXMillis(200);
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
-
-		page.clickSave().confirm();
-
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is as expected");
-		soft.assertTrue(!page.grid().isUserListed(username), "After saving deleted user is not listed");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-100")
-	public void deleteSERVICE_GROUP_ADMIN() {
-
-		String username = Generator.randomAlphaNumeric(10);
-		SMPRestClient.createUser(username, "SERVICE_GROUP_ADMIN");
-		logger.info("Created username" + username);
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		page.refreshPage();
-		page.waitForRowsToLoad();
-
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled");
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		page.waitForRowsToLoad();
-
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted");
-
-		page.clickCancel().confirm();
-		new ConfirmationDialog(driver).confirm();
-		page.waitForRowsToLoad();
-		soft.assertTrue(page.grid().isUserListed(username), "After canceling delete user is still listed");
-
-
-		index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
-
-		page.clickDelete();
-		page.waitForRowsToLoad();
-		soft.assertTrue(!page.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
-
-		page.clickSave().confirm();
-
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is as expected");
-		soft.assertTrue(!page.grid().isUserListed(username), "After saving deleted user is not listed");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-110")
-	public void deleteSG_ADMINWithSG() {
-
-		String username = Generator.randomAlphaNumeric(10);
-		String pi = Generator.randomAlphaNumeric(10);
-		String ps = Generator.randomAlphaNumeric(10);
-
-		String expectedErrorMess = String.format("Delete validation error Could not delete user with ownerships! User: %s owns SG count: 1.", username);
-
-		SMPRestClient.createUser(username, "SERVICE_GROUP_ADMIN");
-		SMPRestClient.createServiceGroup(pi, ps,
-				new ArrayList<>(Arrays.asList(username)),
-				new ArrayList<>(Arrays.asList(createdDomains.get(0)))
-		);
-
-		logger.info("Created username " + username);
-		logger.info("Created service group " + pi);
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		page.refreshPage();
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		AlertMessage message = page.alertArea.getAlertMessage();
-		soft.assertTrue(message.isError(), "Page shows error message when deleting user with SG");
-		soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
-
-		SMPRestClient.deleteSG(pi);
-		SMPRestClient.deleteUser(username);
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-120")
-	public void deleteSMP_ADMINWithSG() {
-
-		String username = Generator.randomAlphaNumeric(10);
-		String pi = Generator.randomAlphaNumeric(10);
-		String ps = Generator.randomAlphaNumeric(10);
-
-		String expectedErrorMess = String.format("Delete validation error Could not delete user with ownerships! User: %s owns SG count: 1.", username);
-
-		SMPRestClient.createUser(username, "SMP_ADMIN");
-		SMPRestClient.createServiceGroup(pi, ps,
-				new ArrayList<>(Arrays.asList(username)),
-				new ArrayList<>(Arrays.asList(createdDomains.get(0)))
-		);
-
-		logger.info("Created username " + username);
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		page.refreshPage();
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is enabled after row select");
-
-		page.clickDelete();
-		page.waitForXMillis(500);
-		AlertMessage message = page.alertArea.getAlertMessage();
-		soft.assertTrue(message.isError(), "Page shows error message when deleting user with SG");
-		soft.assertTrue(message.getMessage().equalsIgnoreCase(expectedErrorMess), "Desired message appears");
-
-		SMPRestClient.deleteSG(pi);
-		SMPRestClient.deleteUser(username);
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-130")
-	public void duplicateUserCreation() {
-		SoftAssert soft = new SoftAssert();
-		String userName = Generator.randomAlphaNumeric(10);
-		String validPass = "Aabcdefghijklm1@";
-		String email = "system@gmail.com";
-		UsersPage page = new UsersPage(driver);
-
-		soft.assertTrue(page.isNewButtonEnabled(), "New button should be enabled");
-
-		UserPopup popup = page.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button is enabled before valid data is filled in the popup");
-		popup.fillDetailsForm(userName, email);
-		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-		popup.clickOK();
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-		page.clickSave().confirm();
-		String adminPass = "123456";
-		int index = page.grid().scrollToUser(userName);
-
-		page.grid().selectRow(index);
-		popup = page.clickEdit();
-		popup.clickSetOrChangePassword();
-		popup.setOrChangePassword(adminPass, validPass, validPass);
-		popup.clickChangedPassword();
-		popup.clickCloseAfterChangedPass();
-		popup.clickCancel();
-		soft.assertTrue(page.grid().isUserListed(userName), "User present in the page");
-
-		page.clickNew();
-
-		popup.fillDetailsForm(userName, email);
-		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-
-		soft.assertFalse(popup.isOKButtonActive(), "OK button is enabled after duplicate user name is filled in the popup");
-
-		soft.assertTrue(popup.isDuplicateUserNameErrorMsgDisPlayed(), "The user page is not containing the expected error message");
-		popup.clickCancel();
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-140")
-	public void verifyPasswordDoNotMatch() {
-		String username = Generator.randomAlphaNumeric(10);
-		String validPass = "Aabcdefghijklm1@";
-		String confirmPass = "AS@!gh12fxghfnh43546";
-		String email = "system@gmail.com";
-		String errorMsg = "Confirm valued does not match new password!";
-		String adminPass = "123456";
-		SoftAssert soft = new SoftAssert();
-		UsersPage usersPage = new UsersPage(driver);
-		UserPopup popup = usersPage.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button is enabled before valid data is filled in the popup");
-		popup.fillDetailsForm(username, email);
-		popup.rolesSelect.selectOptionWithText("SMP_ADMIN");
-		popup.clickOK();
-		soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled");
-		usersPage.clickSave().confirm();
-		int index = usersPage.grid().scrollToUser(username);
-		usersPage.grid().selectRow(index);
-		popup = usersPage.clickEdit();
-		popup.clickSetOrChangePassword();
-		popup.setOrChangePassword(adminPass, validPass, confirmPass);
-		soft.assertTrue(!popup.isChangePasswordButtonActive(), "password change button is enabled before valid data is filled in the popup(2)");
-		soft.assertTrue(!popup.isPopupChangedPasswordEnabled(), "Change password option is not disable after giving the wrong data in cofirmation password");
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-150")
-	public void verifySuspendedUserwithoutPassword() {
-		String username = Generator.randomAlphaNumeric(10);
-		String password = "Aabcdefghijklm1@";
-		String email = "system@gmail.com";
-
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage usersPage = new UsersPage(driver);
-
-		UserPopup popup = usersPage.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
-		popup.fillDetailsForm(username, email);
-		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-		popup.clickOK();
-
-		soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled");
-		soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled");
-
-		usersPage.clickSave().confirm();
-
-		soft.assertTrue(!usersPage.alertArea.getAlertMessage().isError(), "Message listed is success");
-		soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
-
-		soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
-
-		usersPage.pageHeader.sandwichMenu.logout();
-		SearchPage page = new SearchPage(driver);
-		logger.info("Going to login page");
-		LoginPage loginPage = page.pageHeader.goToLogin();
-		for (int i = 0; i < 5; i++) {
-			loginPage.invalidLogin(username, password);
-			loginPage.waitForXMillis(2000);
-		}
-		soft.assertTrue(loginPage.isLoginButtonEnable(), "Login Button Is Disabled");
-		logger.info(loginPage.alertArea.getAlertMessage().getMessage());
-		soft.assertTrue(loginPage.alertArea.getAlertMessage().getMessage().contains(SMPMessages.MSG_22), "Message listed is as expected");
-
-		SMPPage smpPage = genericLoginProcedure("SYS_ADMIN");
-		logger.info("Going to User page");
-		smpPage.sidebar.goToPage(UsersPage.class);
-		usersPage = new UsersPage(driver);
-		int index = usersPage.grid().scrollToUser(username);
-		usersPage.grid().selectRow(index);
-		soft.assertTrue(usersPage.isDeleteButtonEnabled(), "Delete button is enabled after row select(2)");
-
-		usersPage.clickDelete();
-		usersPage.waitForXMillis(200);
-		soft.assertTrue(!usersPage.isDeleteButtonEnabled(), "Delete button is not enabled after user is deleted(2)");
-		soft.assertTrue(usersPage.isSaveButtonEnabled(), "Save button is enabled after user is deleted(2)");
-		soft.assertTrue(usersPage.isCancelButtonEnabled(), "Cancel button is enabled after user is deleted(2)");
-
-		usersPage.clickSave().confirm();
-
-		soft.assertTrue(usersPage.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message is as expected");
-		soft.assertTrue(!usersPage.grid().isUserListed(username), "After saving deleted user is not listed");
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-160")
-	public void userPageUIAppearanceAndBehaviour() {
-		SoftAssert soft = new SoftAssert();
-
-		UsersPage page = new UsersPage(driver);
-		soft.assertTrue(page.isLoaded());
-		soft.assertTrue(page.isNewButtonEnabled(), "New button is not enabled");
-		soft.assertTrue(page.isEditTruststoreButtonEnabled(), "EditTruststore Button is not enabled");
-		soft.assertTrue(page.isDeleteButtonVisible(), "Delete button is not visible");
-		soft.assertTrue(page.isEditButtonVisible(), "Edit button is not visible");
-		soft.assertTrue(page.isSaveButtonVisible(), "Save button is not visible");
-		soft.assertTrue(page.isCancelButtonVisible(), "Cancel button is not visible");
-		soft.assertTrue(!page.isEditButtonEnabled(), "Edit button is  enabled");
-		soft.assertTrue(!page.isSaveButtonEnabled(), "Save button is  enabled");
-		soft.assertTrue(!page.isCancelButtonEnabled(), "Cancel button is  enabled");
-		int index = 0;
-		page.grid().selectRow(index);
-		soft.assertTrue(page.isDeleteButtonEnabled(), "Delete button is not enabled after row select(2)");
-		soft.assertTrue(page.isEditButtonEnabled(), "Edit button is not enabled after row select(2)");
-
-
-		soft.assertAll();
-	}
-
-	@Test(description = "USR-170")
-	public void editUserUIAppearanceAndBehaviour() {
-		SoftAssert soft = new SoftAssert();
-		UsersPage page = new UsersPage(driver);
-		soft.assertTrue(page.isLoaded());
-		String username = Generator.randomAlphaNumeric(10);
-		String email = "system@gmail.com";
-		UserPopup popup = page.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
-		popup.fillDetailsForm(username, email);
-		popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-		popup.clickOK();
-		soft.assertTrue(page.isSaveButtonEnabled(), "Save button is enabled");
-		soft.assertTrue(page.isCancelButtonEnabled(), "Cancel button is enabled");
-
-		page.clickSave().confirm();
-
-		soft.assertTrue(!page.alertArea.getAlertMessage().isError(), "Message listed is success");
-		soft.assertTrue(page.alertArea.getAlertMessage().getMessage().equalsIgnoreCase(SMPMessages.MSG_18), "Message listed is as expected");
-
-		int index = page.grid().scrollToUser(username);
-		page.grid().selectRow(index);
-		popup = page.clickEdit();
-		soft.assertTrue(!popup.isUsernameFieldEnabled(), "Username field is enabled for an existing user");
-		soft.assertTrue(popup.isEmailFieldEnabled(), "Email field is not enabled for an existing user");
-		soft.assertTrue(popup.isRoleSelectFieldEnabled(), "Role field is not enabled for an existing user");
-		soft.assertTrue(popup.isSetOrChangePassOptionBtnEnabled(), "SetOrChangePassOptionBtn field is not enabled for an existing user");
-		soft.assertTrue(popup.isRegenerateAccesstokenBtnEnabled(), "Email field is not enabled for an existing user");
-		soft.assertTrue(popup.isOKButtonActive(), "Ok btn is not enabled for an existing user in user popup");
-		soft.assertTrue(popup.isCancelButtonActive(), "Cancel btn is not enabled for an existing user in user popup");
-		soft.assertTrue(popup.isImportButtonActive(), "Import btn is not enabled for an existing user in user popup");
-		if (page.grid().userHasCertificate(index)) {
-			soft.assertTrue(popup.isShowDetailsButtonActive(), "ShowDetails btn is not enabled for an existing user in user popup");
-			soft.assertTrue(popup.isClearButtonActive(), "Clear btn is not enabled for an existing user in user popup");
-		} else {
-			soft.assertTrue(!popup.isShowDetailsButtonActive(), "ShowDetails btn is enabled for an existing user in user popup");
-			soft.assertTrue(!popup.isClearButtonActive(), "Clear btn is enabled for an existing user in user popup");
-
-		}
-
-		soft.assertAll();
-
-
-	}
-
-	@Test(description = "USR-180")
-	public void userEmailValidation() {
-		SoftAssert soft = new SoftAssert();
-		UsersPage page = new UsersPage(driver);
-		soft.assertTrue(page.isLoaded());
-		String username = Generator.randomAlphaNumeric(10);
-		ArrayList<String> email = new ArrayList<>(Arrays.asList("sdfdgfdghxvfv@gmail.c",
-				"sdfdgfdghxvfv$gmail.com",
-				"hdbvsdkvdsvf"));
-		UserPopup popup = page.clickNew();
-		soft.assertTrue(!popup.isOKButtonActive(), "OK button should be disabled until valid data is filled in the popup");
-		for (String emailId : email) {
-			popup.fillDetailsForm(username, emailId);
-			popup.rolesSelect.selectOptionWithText("SYSTEM_ADMIN");
-			soft.assertTrue(!popup.isOKButtonActive(), "OK button is active after sending invalid email");
-			soft.assertEquals(popup.userEmailValidationGetErrMsg(), SMPMessages.USER_EMAIL_VALIDATION_MESSAGE, "Message is not in the list");
-		}
-		soft.assertAll();
-	}
-
-
-}