diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..bc5062631d88edf835348b28e98bdc2a9e108b99
--- /dev/null
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
@@ -0,0 +1,82 @@
+*** Settings ***
+Library           JSONSchemaLibrary    schemas/
+Resource          environment/variables.txt
+Library           JSONLibrary
+Library           OperatingSystem
+Resource          NFVMANOCimKeywords.robot
+Library           REST    ${NFVMANO_SCHEMA}://${NFVMANO_HOST}:${NFVMANO_PORT}    ssl_verify=false
+Library           MockServerLibrary
+*** Test Cases ***
+POST NFV-MANO functional entity application state change
+    [Documentation]    Test ID: 8.3.4.2.1
+    ...    Test title: POST NFV-MANO functional entity application state change
+    ...    Test objective: The objective is to request state change of the NFV-MANO functional entity application.
+    ...    Pre-conditions: 
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Post request for NFV-MANO functional entity application state change
+    Check HTTP Response Status Code Is    202
+    Check Operation Occurrence Id
+    
+POST NFV-MANO functional entity application state change - Conflict
+    [Documentation]    Test ID: 8.3.4.2.2
+    ...    Test title: POST NFV-MANO functional entity application state change - Conflict
+    ...    Test objective: The objective is to test that request to change the state of the NFV-MANO functional entity application failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
+    ...    Pre-conditions: 
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Post request for NFV-MANO functional entity application state change
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+GET NFV-MANO functional entity application state change - Method not implemented
+    [Documentation]    Test ID: 8.3.4.2.3
+    ...    Test title: GET NFV-MANO functional entity application state change - Method not implemented
+    ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
+    ...    Pre-conditions: 
+    ...    Reference: clause 5.5.7.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Get request for NFV-MANO functional entity application state change
+    Check HTTP Response Status Code Is    405
+    
+PUT NFV-MANO functional entity application state change - Method not implemented
+    [Documentation]    Test ID: 8.3.4.2.4
+    ...    Test title: PUT NFV-MANO functional entity application state change - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
+    ...    Pre-conditions: 
+    ...    Reference: clause 5.5.7.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Put request for NFV-MANO functional entity application state change
+    Check HTTP Response Status Code Is    405
+    
+PATCH NFV-MANO functional entity application state change - Method not implemented
+    [Documentation]    Test ID: 8.3.4.2.5
+    ...    Test title: PATCH NFV-MANO functional entity application state change - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
+    ...    Pre-conditions: 
+    ...    Reference: clause 5.5.7.3.4 - ETSI GS NFV-SOL 009 [5] V3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Patch request for NFV-MANO functional entity application state change
+    Check HTTP Response Status Code Is    405
+    
+DELETE NFV-MANO functional entity application state change - Method not implemented
+    [Documentation]    Test ID: 8.3.4.2.6
+    ...    Test title: DELETE NFV-MANO functional entity application state change - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
+    ...    Pre-conditions: 
+    ...    Reference: clause 5.5.7.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Delete request for NFV-MANO functional entity application state change
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
index e6a760bcc81be51a8156921308d9ebb21bc69397..8eed9958ef2247842e95b6e6d3c1b6c11b25215a 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
@@ -27,6 +27,10 @@ Check HTTP Response Body Json Schema Is
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
+    
+Check Operation Occurrence Id
+    ${OpOccId}=    Get Value From Json    ${response['headers']}    $..Location
+    Should Not Be Empty    ${OpOccId}
 
 Send Post request for NFV-MANO Entity
     Log    Trying to perform a POST (method should not be implemented)
@@ -71,4 +75,47 @@ Send Delete request for NFV-MANO Entity
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity
     ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Post request for NFV-MANO functional entity application state change
+    Log    Trying to perform a POST for NFV-MANO functional entity application state change
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Get request for NFV-MANO functional entity application state change
+    Log    Trying to perform a GET (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Put request for NFV-MANO functional entity application state change
+    Log    Trying to perform a PUT (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/log_jobs/mano_entity/change_state
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/log_jobs/mano_entity/change_state
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Patch request for NFV-MANO functional entity application state change
+    Log    Trying to perform a PATCH (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Delete request for NFV-MANO functional entity application state change
+    Log    Trying to perform a DELETE (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
+    ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFV-MANO Entity.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
similarity index 97%
rename from SOL009/NFVManoConfigurationAndInformationManagement-API/NFV-MANO Entity.robot
rename to SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
index eeaf33930076708d66ee6d53b9d0c353dd9e20fe..b6c85e15fdc0c66039e765ea51fa9185675b54a0 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFV-MANO Entity.robot	
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
@@ -94,4 +94,4 @@ DELETE NFV-MANO entity - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: 
     Send Delete request for NFV-MANO Entity
-    Check HTTP Response Status Code Is    405
+    Check HTTP Response Status Code Is    405
\ No newline at end of file