[VOL-2634] adding new tests to the nightly jobs and fix issues

Change-Id: I86bebc2a078fb11cefbea3b4beadcb219ac92ac2
diff --git a/tests/functional/Voltha_FailureScenarios.robot b/tests/functional/Voltha_FailureScenarios.robot
index 98c243d..f214e96 100644
--- a/tests/functional/Voltha_FailureScenarios.robot
+++ b/tests/functional/Voltha_FailureScenarios.robot
@@ -62,11 +62,11 @@
     ...    controls the power off/on ONUs/OLT remotely (simulating a physical reboot)
     ...    VOL-2634
     [Tags]    functional   PowerSwitch
-    [Setup]    Run Keywords    Announce Message    START TEST PowerSwitch
-    ...        AND             Start Logging    PowerSwitch
+    [Setup]    Run Keywords    Announce Message    START TEST ONUreboot_PowerSwitch
+    ...        AND             Start Logging    ONUreboot_PowerSwitch
     [Teardown]    Run Keywords    Collect Logs
-    ...           AND             Stop Logging    PowerSwitch
-    ...           AND             Announce Message    END TEST PowerSwitch
+    ...           AND             Stop Logging    ONUreboot_PowerSwitch
+    ...           AND             Announce Message    END TEST ONUreboot_PowerSwitch
     # Add OLT device
     setup
     # Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable