Minor Fixes to tests

Change-Id: I7ccc4b2f7bee7d333efdbc23b0e7b47b8b244b6e
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 977087c..9640838 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -111,7 +111,7 @@
     List Should Not Contain Value    ${ids}    ${fakeDeviceId}
     #Disable fake device id
     ${rc}  ${output}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device disable ${fakeDeviceId}
-    Should Contain    ${output}     Error while disabling '${fakeDeviceId}': rpc error: code = NotFound desc
+    Should Contain    ${output}     Error while disabling '${fakeDeviceId}'
 
 Check deletion of OLT/ONU before disabling
     [Documentation]    Try deleting OL/ONU before disabling and check error message