diff --git a/tests/ccsdk-oran/polmansuite/__init__.robot b/tests/ccsdk-oran/polmansuite/__init__.robot
new file mode 100644
index 0000000..bf52713
--- /dev/null
+++ b/tests/ccsdk-oran/polmansuite/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Non-RT RIC Policy Management - polmansuite
diff --git a/tests/ccsdk-oran/polmansuite/test.robot b/tests/ccsdk-oran/polmansuite/test.robot
new file mode 100644
index 0000000..be39628
--- /dev/null
+++ b/tests/ccsdk-oran/polmansuite/test.robot
@@ -0,0 +1,16 @@
+*** Settings ***
+Library       OperatingSystem
+Library       Process
+
+*** Test Cases ***
+
+Functional Test Case 1
+    [Documentation]                 Functional Test Case 1 - FTC1
+    Start Process                   ${AUTOTEST_ROOT}/FTC1.sh   remote  auto-clean  shell=true   cwd=${AUTOTEST_ROOT}
+    ${cli_cmd_output}=              Wait For Process    timeout=3600
+    Should Be Equal as Integers     ${cli_cmd_output.rc}    0
+    ${ResultFileContent}=           Get File                        ${AUTOTEST_ROOT}/.resultFTC1.txt
+    Should Be Equal As Integers     ${ResultFileContent}    0
+
+
+
diff --git a/tests/ccsdk/oran/suite1/__init__.robot b/tests/ccsdk/oran/suite1/__init__.robot
deleted file mode 100644
index 09aa031..0000000
--- a/tests/ccsdk/oran/suite1/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation    Ccsdk Oran - Suite 1
diff --git a/tests/ccsdk/oran/suite1/test1.robot b/tests/ccsdk/oran/suite1/test1.robot
deleted file mode 100644
index 10e6852..0000000
--- a/tests/ccsdk/oran/suite1/test1.robot
+++ /dev/null
@@ -1,30 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-
-*** Variables ***
-${MESSAGE}    Hello, world!
-
-*** Test Cases ***
-String Equality Test
-    Should Be Equal    ${MESSAGE}    Hello, world!
-
-Dir Test
-    [Documentation]    Check if /tmp exists
-    Log                ${MESSAGE}
-    CheckDir           /tmp
-
-Url Test
-    [Documentation]    Check if google.com can be reached
-    CheckUrl           http://www.google.com
-
-*** Keywords ***
-CheckDir
-    [Arguments]                 ${path}
-    Directory Should Exist      ${path}
-
-CheckUrl
-    [Arguments]                  ${url}
-    Create Session               session              ${url}
-    ${resp}=                     Get Request          session                  /
-    Should Be Equal As Integers  ${resp.status_code}  200
diff --git a/tests/ccsdk/oran/suite2/__init__.robot b/tests/ccsdk/oran/suite2/__init__.robot
deleted file mode 100644
index c9bbad3..0000000
--- a/tests/ccsdk/oran/suite2/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation    Ccsdk Oran - Suite 2
diff --git a/tests/ccsdk/oran/suite2/test1.robot b/tests/ccsdk/oran/suite2/test1.robot
deleted file mode 100644
index 5d354dd..0000000
--- a/tests/ccsdk/oran/suite2/test1.robot
+++ /dev/null
@@ -1,30 +0,0 @@
-*** Settings ***
-Library       OperatingSystem
-Library       RequestsLibrary
-
-*** Variables ***
-${MESSAGE}    Hello, world!
-
-*** Test Cases ***
-String Equality Test
-    Should Be Equal    ${MESSAGE}    Hello, world!
-
-Dir Test
-    [Documentation]    Check if /tmp exists
-    Log                ${MESSAGE}
-    CheckDir           /tmp
-
-Url Test
-    [Documentation]    Check if www.onap.org can be reached
-    Create Session     openo          http://www.onap.org
-    CheckUrl           openo          /
-
-*** Keywords ***
-CheckDir
-    [Arguments]                 ${path}
-    Directory Should Exist      ${path}
-
-CheckUrl
-    [Arguments]                  ${session}   ${path}
-    ${resp}=                     Get Request          ${session}               ${path}
-    Should Be Equal As Integers  ${resp.status_code}  200
diff --git a/tests/ccsdk/oran/vCPE/__init__.robot b/tests/ccsdk/oran/vCPE/__init__.robot
deleted file mode 100644
index f6230ae..0000000
--- a/tests/ccsdk/oran/vCPE/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation    Ccsdk Oran - vCPE
diff --git a/tests/ccsdk/oran/vCPE/test1.robot b/tests/ccsdk/oran/vCPE/test1.robot
deleted file mode 100644
index d07bf6e..0000000
--- a/tests/ccsdk/oran/vCPE/test1.robot
+++ /dev/null
@@ -1,60 +0,0 @@
-*** Settings ***
-Suite Setup       Suite Setup
-Suite Teardown    Suite Teardown
-Library           OperatingSystem
-Library           RequestsLibrary
-Library           Process
-Library           ONAPLibrary.Utilities
-
-*** Variables ***
-${GLOBAL_APPLICATION_ID}    csit-vCPE
-${GLOBAL_MSO_USERNAME}    InfraPortalClient
-${GLOBAL_MSO_PASSWORD}    password1$
-
-*** Test Cases ***
-SO ServiceInstance health check
-    ${auth}=    Create List    ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
-    ${session}=    Create Session    so    http://${SO_IP}:8080
-    ${uuid}=    Generate UUID4
-    ${headers}=    Create Dictionary    Accept=text/html    Content-Type=text/html    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
-    ${resp}=    Get Request    so    /ecomp/mso/infra/globalhealthcheck    headers=${headers}
-    &{headers}=    Create Dictionary    Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    so    /ecomp/mso/infra/orchestrationRequests/v2    headers=${headers}
-    Should Not Contain    ${resp.content}    null
-
-*** Keywords ***
-Run Docker
-    [Arguments]    ${image}    ${name}    ${parameters}=${EMPTY}
-    ${result}=    Run Process    docker run --name ${name} ${parameters} -d ${image}    shell=True
-    Should Be Equal As Integers    ${result.rc}    0
-    Log    ${result.stdout}
-    ${result}=    Run Process    docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${name}    shell=True
-    Should Be Equal As Integers    ${result.rc}    0
-    Log    ${result.stdout}
-    [Return]    ${result.stdout}
-
-Kill Docker
-    [Arguments]    ${name}
-    ${result}=    Run Process    docker logs ${name}    shell=True
-    Should Be Equal As Integers    ${result.rc}    0
-    Log    ${result.stdout}
-    ${result}=    Run Process    docker kill ${name}    shell=True
-    Should Be Equal As Integers    ${result.rc}    0
-    Log    ${result.stdout}
-    ${result}=    Run Process    docker rm ${name}    shell=True
-    Should Be Equal As Integers    ${result.rc}    0
-    Log    ${result.stdout}
-
-CheckUrl
-    [Arguments]    ${url}
-    Create Session    session    ${url}    disable_warnings=True
-    ${resp}=    Get Request    session    /
-    Should Be Equal As Integers    ${resp.status_code}    200
-
-Suite Setup
-    ${SO_IP}=    Run Docker    nexus3.onap.org:10001/openecomp/mso    i-so
-    Wait Until Keyword Succeeds    1 min    5 sec    CheckUrl    http://${SO_IP}:8080
-    Set Suite Variable    ${SO_IP}
-
-Suite Teardown
-    Kill Docker    i-so