diff --git a/tests/adbe_tests.py b/tests/adbe_tests.py
index b8cfe09..9954f6e 100644
--- a/tests/adbe_tests.py
+++ b/tests/adbe_tests.py
@@ -467,16 +467,9 @@ def test_location():
 
 def test_debug_app_set():
     _assert_success('debug-app set %s' % _TEST_APP_ID)
-
-
-def test_debug_app_clear():
     _assert_success('debug-app clear')
 
 
-def test_debug_app_set_fail():
-    _assert_fail('debug-app set %s' % _TEST_NON_EXISTANT_APP_ID)
-
-
 def _assert_fail(sub_cmd):
     exit_code, stdout_data, stderr_data = _execute(sub_cmd)
     assert exit_code == 1, 'Command "%s" failed with stdout: "%s" and stderr: "%s"' %(sub_cmd, stdout_data, stderr_data)
@@ -568,7 +561,8 @@ def main():
     test_location()
     test_debug_app_set()
     test_debug_app_clear()
-    test_debug_app_set_fail()
+    test_debug_app_set_wait()
+    test_debug_app_set_persistant()
     # TODO: Add a test for screen record after figuring out how to perform ^C while it is running.