Telephony Test: remove self.tests for all test classes.

Remove self.tests in __init__ for all test classes.

Change-Id: Ied8e7ba718739e93bb08196d644e7c8234f31945
diff --git a/acts/tests/google/tel/live/TelLiveDataTest.py b/acts/tests/google/tel/live/TelLiveDataTest.py
index 77983b7..f053736 100644
--- a/acts/tests/google/tel/live/TelLiveDataTest.py
+++ b/acts/tests/google/tel/live/TelLiveDataTest.py
@@ -97,51 +97,6 @@
 class TelLiveDataTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = ("test_airplane_mode",
-                      "test_4g",
-                      "test_3g",
-                      "test_2g",
-                      "test_lte_wifi_switching",
-                      "test_wcdma_wifi_switching",
-                      "test_gsm_wifi_switching",
-                      "test_wifi_connect_disconnect",
-                      "test_lte_multi_bearer",
-                      "test_wcdma_multi_bearer",
-                      "test_2g_wifi_not_associated",
-                      "test_3g_wifi_not_associated",
-                      "test_4g_wifi_not_associated",
-
-                      # WiFi Tethering tests
-                      "test_tethering_entitlement_check",
-                      "test_tethering_2g_to_2gwifi",
-                      "test_tethering_2g_to_5gwifi",
-                      "test_tethering_3g_to_5gwifi",
-                      "test_tethering_3g_to_2gwifi",
-                      "test_tethering_4g_to_5gwifi",
-                      "test_tethering_4g_to_2gwifi",
-                      "test_tethering_4g_to_2gwifi_2clients",
-                      "test_toggle_apm_during_active_wifi_tethering",
-                      "test_toggle_data_during_active_wifi_tethering",
-                      "test_disable_wifi_tethering_resume_connected_wifi",
-                      "test_tethering_wifi_ssid_quotes",
-                      "test_tethering_wifi_no_password",
-                      "test_tethering_wifi_password_escaping_characters",
-                      "test_tethering_wifi_ssid",
-                      "test_tethering_wifi_password",
-                      "test_tethering_wifi_volte_call",
-                      "test_tethering_wifi_csfb_call",
-                      "test_tethering_wifi_3g_call",
-                      "test_tethering_wifi_reboot",
-                      "test_connect_wifi_start_tethering_wifi_reboot",
-                      "test_connect_wifi_reboot_start_tethering_wifi",
-                      "test_tethering_wifi_screen_off_enable_doze_mode",
-
-                      # stress tests
-                      "test_4g_stress",
-                      "test_3g_stress",
-                      "test_lte_multi_bearer_stress",
-                      "test_wcdma_multi_bearer_stress",
-                      "test_tethering_4g_to_2gwifi_stress",)
         self.stress_test_number = int(self.user_params["stress_test_number"])
         self.wifi_network_ssid = self.user_params["wifi_network_ssid"]
 
diff --git a/acts/tests/google/tel/live/TelLivePreflightTest.py b/acts/tests/google/tel/live/TelLivePreflightTest.py
index d40efa3..08dfb2d 100644
--- a/acts/tests/google/tel/live/TelLivePreflightTest.py
+++ b/acts/tests/google/tel/live/TelLivePreflightTest.py
@@ -48,7 +48,6 @@
 class TelLivePreflightTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = ("test_pre_flight_check", )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
 
diff --git a/acts/tests/google/tel/live/TelLiveRebootStressTest.py b/acts/tests/google/tel/live/TelLiveRebootStressTest.py
index 6b9d1df..02697a6 100644
--- a/acts/tests/google/tel/live/TelLiveRebootStressTest.py
+++ b/acts/tests/google/tel/live/TelLiveRebootStressTest.py
@@ -68,10 +68,6 @@
 class TelLiveRebootStressTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            "test_reboot_stress",
-            "test_reboot_stress_without_clear_provisioning"
-            )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.stress_test_number = int(self.user_params["stress_test_number"])
diff --git a/acts/tests/google/tel/live/TelLiveSettingsTest.py b/acts/tests/google/tel/live/TelLiveSettingsTest.py
index 31d75c2..26c58bd 100644
--- a/acts/tests/google/tel/live/TelLiveSettingsTest.py
+++ b/acts/tests/google/tel/live/TelLiveSettingsTest.py
@@ -59,37 +59,7 @@
 
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            "test_lte_volte_wifi_connected_toggle_wfc",
-            "test_lte_wifi_connected_toggle_wfc",
-            "test_3g_wifi_connected_toggle_wfc",
-            "test_apm_wifi_connected_toggle_wfc",
 
-            "test_lte_volte_wfc_enabled_toggle_wifi",
-            "test_lte_wfc_enabled_toggle_wifi",
-            "test_3g_wfc_enabled_toggle_wifi",
-            "test_apm_wfc_enabled_toggle_wifi",
-
-            "test_lte_wfc_enabled_wifi_connected_toggle_volte",
-
-            "test_lte_volte_wfc_wifi_preferred_to_cellular_preferred",
-            "test_lte_wfc_wifi_preferred_to_cellular_preferred",
-            "test_3g_wfc_wifi_preferred_to_cellular_preferred",
-            "test_apm_wfc_wifi_preferred_to_cellular_preferred",
-            "test_lte_volte_wfc_cellular_preferred_to_wifi_preferred",
-            "test_lte_wfc_cellular_preferred_to_wifi_preferred",
-            "test_3g_wfc_cellular_preferred_to_wifi_preferred",
-            "test_apm_wfc_cellular_preferred_to_wifi_preferred",
-
-            "test_apm_wfc_wifi_preferred_turn_off_apm",
-            "test_apm_wfc_cellular_preferred_turn_off_apm",
-
-            "test_wfc_setup_timing",
-            "test_lte_volte_wfc_enabled_toggle_wifi_stress",
-            "test_lte_volte_wfc_enabled_reset_wifi_stress",
-            "test_lte_volte_wfc_wifi_preferred_to_cellular_preferred_stress"
-
-        )
         self.ad = self.android_devices[0]
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.wifi_network_ssid = self.user_params["wifi_network_ssid"]
diff --git a/acts/tests/google/tel/live/TelLiveSmokeTest.py b/acts/tests/google/tel/live/TelLiveSmokeTest.py
index 9523932..982d0e9 100644
--- a/acts/tests/google/tel/live/TelLiveSmokeTest.py
+++ b/acts/tests/google/tel/live/TelLiveSmokeTest.py
@@ -55,13 +55,6 @@
 class TelLiveSmokeTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            "test_smoke_volte_call_data_sms",
-            "test_smoke_csfb_3g_call_data_sms",
-            "test_smoke_3g_call_data_sms",
-            "test_smoke_wfc_call_sms",
-            "test_smoke_data_airplane_mode_network_switch_tethering"
-            )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
 
diff --git a/acts/tests/google/tel/live/TelLiveSmsTest.py b/acts/tests/google/tel/live/TelLiveSmsTest.py
index a364c4d..382ac18 100644
--- a/acts/tests/google/tel/live/TelLiveSmsTest.py
+++ b/acts/tests/google/tel/live/TelLiveSmsTest.py
@@ -60,31 +60,6 @@
 class TelLiveSmsTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = ("test_sms_mo_4g",
-                      "test_sms_mt_4g",
-                      "test_sms_mo_in_call_volte",
-                      "test_sms_mt_in_call_volte",
-                      "test_sms_mo_in_call_csfb",
-                      "test_sms_mt_in_call_csfb",
-                      "test_sms_mo_in_call_csfb_1x",
-                      "test_sms_mt_in_call_csfb_1x",
-                      "test_sms_mo_3g",
-                      "test_sms_mt_3g",
-                      "test_sms_mo_in_call_wcdma",
-                      "test_sms_mt_in_call_wcdma",
-                      "test_sms_mo_in_call_1x",
-                      "test_sms_mt_in_call_1x",
-                      "test_sms_mo_2g",
-                      "test_sms_mt_2g",
-                      "test_sms_mo_in_call_gsm",
-                      "test_sms_mt_in_call_gsm",
-                      "test_sms_mo_iwlan",
-                      "test_sms_mt_iwlan",
-                      "test_sms_mo_in_call_iwlan",
-                      "test_sms_mt_in_call_iwlan",
-                      "test_sms_mo_in_call_vt",
-                      "test_sms_mt_in_call_vt",
-                    )
         # The path for "sim config file" should be set
         # in "testbed.config" entry "sim_conf_file".
         self.simconf = load_config(self.user_params["sim_conf_file"])
diff --git a/acts/tests/google/tel/live/TelLiveStressCallTest.py b/acts/tests/google/tel/live/TelLiveStressCallTest.py
index fa0bd5f..bfc0703 100644
--- a/acts/tests/google/tel/live/TelLiveStressCallTest.py
+++ b/acts/tests/google/tel/live/TelLiveStressCallTest.py
@@ -38,7 +38,6 @@
 class TelLiveStressCallTest(BaseTestClass):
     def __init__(self, controllers):
         BaseTestClass.__init__(self, controllers)
-        self.tests = ("test_call_3g_stress", )
 
     def setup_class(self):
         self.ad_caller = self.android_devices[0]
diff --git a/acts/tests/google/tel/live/TelLiveVideoDataTest.py b/acts/tests/google/tel/live/TelLiveVideoDataTest.py
index a01e674..daa9881 100644
--- a/acts/tests/google/tel/live/TelLiveVideoDataTest.py
+++ b/acts/tests/google/tel/live/TelLiveVideoDataTest.py
@@ -31,9 +31,6 @@
 class TelLiveVideoDataTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            # Data during VT call
-            "test_internet_access_during_video_call", )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.stress_test_number = int(self.user_params["stress_test_number"])
diff --git a/acts/tests/google/tel/live/TelLiveVideoTest.py b/acts/tests/google/tel/live/TelLiveVideoTest.py
index 753e0b6..60c5e21 100644
--- a/acts/tests/google/tel/live/TelLiveVideoTest.py
+++ b/acts/tests/google/tel/live/TelLiveVideoTest.py
@@ -66,44 +66,6 @@
 class TelLiveVideoTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            "test_call_video_to_video",
-            "test_call_video_accept_as_voice",
-            "test_call_video_to_video_mo_disable_camera",
-            "test_call_video_to_video_mt_disable_camera",
-            "test_call_video_to_video_mo_mt_disable_camera",
-            "test_call_video_to_video_mt_mo_disable_camera",
-            "test_call_volte_to_volte_mo_upgrade_bidirectional",
-            "test_call_video_accept_as_voice_mo_upgrade_bidirectional",
-            "test_call_volte_to_volte_mo_upgrade_reject",
-            "test_call_video_accept_as_voice_mo_upgrade_reject",
-            "test_call_video_to_video_mo_to_backgroundpause_foregroundresume",
-            "test_call_video_to_video_mt_to_backgroundpause_foregroundresume",
-
-            # Video Call + Voice Call
-            "test_call_video_add_mo_voice",
-            "test_call_video_add_mt_voice",
-            "test_call_volte_add_mo_video",
-            "test_call_volte_add_mt_video",
-            "test_call_video_add_mt_voice_swap_once_local_drop",
-            "test_call_video_add_mt_voice_swap_twice_remote_drop_voice_unhold_video",
-
-            # Video + Video
-            "test_call_video_add_mo_video",
-            "test_call_video_add_mt_video",
-            "test_call_mt_video_add_mt_video",
-            "test_call_mt_video_add_mo_video",
-
-            # VT conference
-            "test_call_volte_add_mo_video_accept_as_voice_merge_drop",
-            "test_call_volte_add_mt_video_accept_as_voice_merge_drop",
-            "test_call_video_add_mo_voice_swap_downgrade_merge_drop",
-            "test_call_video_add_mt_voice_swap_downgrade_merge_drop",
-            "test_call_volte_add_mo_video_downgrade_merge_drop",
-            "test_call_volte_add_mt_video_downgrade_merge_drop",
-
-            # Disable Data, VT not available
-            "test_disable_data_vt_unavailable", )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.stress_test_number = int(self.user_params["stress_test_number"])
diff --git a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
index 2d2869c..b64ec35 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
@@ -73,318 +73,6 @@
 
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            # GSM
-            "test_gsm_mo_mo_add_merge_drop",
-            "test_gsm_mt_mt_add_merge_drop"
-
-            # 1x conference
-            "test_1x_mo_mo_add_merge_drop_from_participant",
-            "test_1x_mo_mo_add_merge_drop_from_host",
-            # 1x multi call
-            "test_1x_mo_mt_add_drop_active",
-            "test_1x_mo_mt_add_drop_held",
-            "test_1x_mo_mt_add_drop_on_dut",
-            "test_1x_mt_mt_add_drop_active",
-            "test_1x_mt_mt_add_drop_held",
-            "test_1x_mt_mt_add_drop_on_dut",
-            "test_1x_mo_mt_add_swap_twice_drop_active",
-            "test_1x_mo_mt_add_swap_twice_drop_held",
-            "test_1x_mo_mt_add_swap_twice_drop_on_dut",
-            "test_1x_mt_mt_add_swap_twice_drop_active",
-            "test_1x_mt_mt_add_swap_twice_drop_held",
-            "test_1x_mt_mt_add_swap_twice_drop_on_dut",
-            "test_1x_mo_mt_add_swap_once_drop_active",
-            "test_1x_mo_mt_add_swap_once_drop_held",
-            "test_1x_mo_mt_add_swap_once_drop_on_dut",
-            "test_1x_mt_mt_add_swap_once_drop_active",
-            "test_1x_mt_mt_add_swap_once_drop_held",
-            "test_1x_mt_mt_add_swap_once_drop_on_dut",
-
-            # WCDMA
-            "test_wcdma_mo_mo_add_merge_drop",
-            "test_wcdma_mt_mt_add_merge_drop",
-            "test_wcdma_mo_mo_add_swap_twice_drop_held",
-            "test_wcdma_mo_mo_add_swap_twice_drop_active",
-            "test_wcdma_mo_mt_add_swap_twice_drop_held",
-            "test_wcdma_mo_mt_add_swap_twice_drop_active",
-            "test_wcdma_mo_mo_add_swap_once_drop_held",
-            "test_wcdma_mo_mo_add_swap_once_drop_active",
-            "test_wcdma_mo_mt_add_swap_once_drop_held",
-            "test_wcdma_mo_mt_add_swap_once_drop_active",
-            "test_wcdma_mo_mo_add_swap_once_merge_drop",
-            "test_wcdma_mo_mo_add_swap_twice_merge_drop",
-            "test_wcdma_mo_mt_add_swap_once_merge_drop",
-            "test_wcdma_mo_mt_add_swap_twice_merge_drop",
-            "test_wcdma_mt_mt_add_swap_once_merge_drop",
-            "test_wcdma_mt_mt_add_swap_twice_merge_drop",
-            "test_wcdma_mt_mt_add_merge_unmerge_swap_drop",
-
-            # CSFB WCDMA
-            "test_csfb_wcdma_mo_mo_add_swap_twice_drop_held",
-            "test_csfb_wcdma_mo_mo_add_swap_twice_drop_active",
-            "test_csfb_wcdma_mo_mt_add_swap_twice_drop_held",
-            "test_csfb_wcdma_mo_mt_add_swap_twice_drop_active",
-            "test_csfb_wcdma_mo_mo_add_swap_once_drop_held",
-            "test_csfb_wcdma_mo_mo_add_swap_once_drop_active",
-            "test_csfb_wcdma_mo_mt_add_swap_once_drop_held",
-            "test_csfb_wcdma_mo_mt_add_swap_once_drop_active",
-            "test_csfb_wcdma_mo_mo_add_swap_once_merge_drop",
-            "test_csfb_wcdma_mo_mo_add_swap_twice_merge_drop",
-            "test_csfb_wcdma_mo_mt_add_swap_once_merge_drop",
-            "test_csfb_wcdma_mo_mt_add_swap_twice_merge_drop",
-
-            # VoLTE
-            "test_volte_mo_mo_add_volte_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_volte_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_volte_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_wcdma_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_wcdma_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_wcdma_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_1x_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_1x_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_1x_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_volte_swap_twice_drop_held",
-            "test_volte_mo_mo_add_volte_swap_twice_drop_active",
-            "test_volte_mo_mt_add_volte_swap_twice_drop_held",
-            "test_volte_mo_mt_add_volte_swap_twice_drop_active",
-            "test_volte_mo_mo_add_volte_swap_once_drop_held",
-            "test_volte_mo_mo_add_volte_swap_once_drop_active",
-            "test_volte_mo_mt_add_volte_swap_once_drop_held",
-            "test_volte_mo_mt_add_volte_swap_once_drop_active",
-            "test_volte_mo_mo_add_volte_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_volte_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_volte_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_volte_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_volte_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_volte_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_wcdma_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_wcdma_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_wcdma_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_wcdma_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_wcdma_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_wcdma_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_1x_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mo_add_1x_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_1x_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mo_mt_add_1x_swap_twice_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_1x_swap_once_merge_drop_second_call_from_participant_no_cep",
-            "test_volte_mt_mt_add_1x_swap_twice_merge_drop_second_call_from_participant_no_cep",
-
-            # VoLTE CEP
-            "test_volte_mo_mo_add_volte_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_volte_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_volte_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_volte_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_volte_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_volte_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_volte_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_volte_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_volte_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_volte_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_volte_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_volte_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_wcdma_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_wcdma_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_wcdma_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_wcdma_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_wcdma_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_wcdma_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_wcdma_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_wcdma_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_wcdma_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_wcdma_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_wcdma_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_wcdma_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_1x_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_1x_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_1x_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_1x_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_1x_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_1x_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_1x_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_1x_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_1x_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_1x_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_1x_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_1x_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_volte_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_volte_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_volte_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_volte_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_volte_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_volte_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_volte_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_volte_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_volte_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_volte_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_volte_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_volte_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_volte_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_volte_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_volte_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_volte_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_volte_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_volte_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_volte_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_volte_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_volte_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_volte_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_volte_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_volte_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_wcdma_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_wcdma_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_wcdma_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_wcdma_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_wcdma_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_wcdma_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_wcdma_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_wcdma_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_wcdma_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_wcdma_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_wcdma_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_wcdma_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_wcdma_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_wcdma_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_wcdma_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_wcdma_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_wcdma_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_wcdma_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_wcdma_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_wcdma_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_wcdma_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_wcdma_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_wcdma_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_wcdma_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_1x_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_1x_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_1x_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_1x_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mo_add_1x_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mo_add_1x_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mo_add_1x_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mo_add_1x_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_1x_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_1x_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_1x_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_1x_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mo_mt_add_1x_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mo_mt_add_1x_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mo_mt_add_1x_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mo_mt_add_1x_swap_twice_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_1x_swap_once_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_1x_swap_once_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_1x_swap_once_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_1x_swap_once_merge_drop_first_call_from_host_cep",
-            "test_volte_mt_mt_add_1x_swap_twice_merge_drop_second_call_from_participant_cep",
-            "test_volte_mt_mt_add_1x_swap_twice_merge_drop_second_call_from_host_cep",
-            "test_volte_mt_mt_add_1x_swap_twice_merge_drop_first_call_from_participant_cep",
-            "test_volte_mt_mt_add_1x_swap_twice_merge_drop_first_call_from_host_cep",
-
-            # WiFi Calling Conference
-            # WiFi_Only mode is not supported for now.
-            # epdg, WFC, noAPM, WiFi Only, cell strong, wifi strong
-            "test_epdg_mo_mo_add_epdg_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_merge_drop_wfc_wifi_only",
-            "test_epdg_mt_mt_add_epdg_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_volte_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_volte_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_wcdma_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_wcdma_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_1x_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_1x_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_epdg_swap_twice_drop_held_wfc_wifi_only",
-            "test_epdg_mo_mo_add_epdg_swap_twice_drop_active_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_swap_twice_drop_held_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_swap_twice_drop_active_wfc_wifi_only",
-            "test_epdg_mo_mo_add_epdg_swap_once_drop_held_wfc_wifi_only",
-            "test_epdg_mo_mo_add_epdg_swap_once_drop_active_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_swap_once_drop_held_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_swap_once_drop_active_wfc_wifi_only",
-            "test_epdg_mo_mo_add_epdg_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_epdg_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_volte_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_volte_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_volte_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_volte_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_wcdma_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_wcdma_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_wcdma_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_wcdma_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_1x_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_1x_swap_twice_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mo_add_1x_swap_once_merge_drop_wfc_wifi_only",
-            "test_epdg_mo_mt_add_1x_swap_once_merge_drop_wfc_wifi_only",
-
-            # epdg, WFC, noAPM, WiFi preferred, cell strong, wifi strong
-            "test_epdg_mo_mo_add_epdg_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mt_mt_add_epdg_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_volte_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_wcdma_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_wcdma_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_1x_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_1x_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_twice_drop_held_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_twice_drop_active_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_twice_drop_held_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_twice_drop_active_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_once_drop_held_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_once_drop_active_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_once_drop_held_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_once_drop_active_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_once_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_volte_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_volte_swap_once_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_wcdma_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_wcdma_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_wcdma_swap_once_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_wcdma_swap_once_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_1x_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_1x_swap_twice_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mo_add_1x_swap_once_merge_drop_wfc_wifi_preferred",
-            "test_epdg_mo_mt_add_1x_swap_once_merge_drop_wfc_wifi_preferred",
-
-            # WiFi Calling Multi Call Swap Only
-            "test_epdg_mo_mo_add_epdg_swap_twice_drop_active_apm_wifi_preferred",
-            "test_epdg_mo_mt_add_epdg_swap_once_drop_held_apm_wifi_preferred",
-            "test_epdg_mo_mo_add_epdg_swap_once_drop_active_apm_wfc_wifi_preferred",
-
-            # WiFi Calling Conference No_CEP
-            # Airplane Mode, WiFi Preferred
-            "test_epdg_mo_mo_add_epdg_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_no_cep",
-            "test_epdg_mo_mt_add_epdg_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_no_cep",
-            "test_epdg_mt_mt_add_epdg_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_no_cep",
-
-            # WiFi Calling Multi Call Swap + Conference No_CEP
-            # Airplane Mode, WiFi Preferred
-            "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_no_cep",
-
-            # WiFi Calling Conference CEP
-            # Airplane Mode, WiFi Preferred
-            "test_epdg_mo_mo_add_epdg_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mo_add_epdg_merge_drop_second_call_from_host_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mo_add_epdg_merge_drop_first_call_from_participant_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mo_add_epdg_merge_drop_first_call_from_host_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mt_add_epdg_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mt_add_epdg_merge_drop_second_call_from_host_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mt_add_epdg_merge_drop_first_call_from_participant_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mt_add_epdg_merge_drop_first_call_from_host_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mt_mt_add_epdg_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mt_mt_add_epdg_merge_drop_second_call_from_host_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mt_mt_add_epdg_merge_drop_first_call_from_participant_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mt_mt_add_epdg_merge_drop_first_call_from_host_wfc_apm_wifi_preferred_cep",
-
-            # WiFi Calling Multi Call Swap + Conference CEP
-            # Airplane Mode, WiFi Preferred
-            "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_second_call_from_host_wfc_apm_wifi_preferred_cep",
-            "test_epdg_mo_mt_add_epdg_swap_once_merge_drop_second_call_from_participant_wfc_apm_wifi_preferred_cep",
-            )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.wifi_network_ssid = self.user_params["wifi_network_ssid"]
diff --git a/acts/tests/google/tel/live/TelLiveVoiceTest.py b/acts/tests/google/tel/live/TelLiveVoiceTest.py
index dec3db3..ce6ca19 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceTest.py
@@ -94,98 +94,6 @@
 class TelLiveVoiceTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            "test_call_volte_to_volte",
-            "test_call_volte_to_csfb_3g",
-            "test_call_volte_to_csfb_for_tmo",
-            "test_call_volte_to_csfb_1x_long",
-            "test_call_volte_to_csfb_long",
-            "test_call_volte_to_3g",
-            "test_call_volte_to_3g_1x_long",
-            "test_call_volte_to_3g_wcdma_long",
-            "test_call_volte_to_2g",
-            "test_call_csfb_3g_to_csfb_3g",
-            "test_call_3g_to_3g",
-            "test_call_volte_to_volte_long",
-            "test_call_csfb_3g_to_csfb_3g_long",
-            "test_call_3g_to_3g_long",
-            "test_call_volte_mo_hold_unhold",
-            "test_call_volte_mt_hold_unhold",
-            "test_call_wcdma_mo_hold_unhold",
-            "test_call_wcdma_mt_hold_unhold",
-            "test_call_csfb_mo_hold_unhold",
-            "test_call_csfb_mt_hold_unhold",
-            "test_call_volte_to_volte_7_digit_dialing",
-            "test_call_volte_to_volte_10_digit_dialing",
-            "test_call_volte_to_volte_11_digit_dialing",
-            "test_call_volte_to_volte_12_digit_dialing",
-            "test_call_volte_to_volte_loop",
-            "test_call_csfb_3g_to_csfb_3g_loop",
-            "test_call_3g_to_3g_loop",
-
-            # APM Live WFC tests
-            # epdg, WFC, APM, WiFi only, WiFi strong
-            "test_call_epdg_to_epdg_apm_wfc_wifi_only",
-            "test_call_epdg_to_volte_apm_wfc_wifi_only",
-            "test_call_epdg_to_csfb_3g_apm_wfc_wifi_only",
-            "test_call_epdg_to_3g_apm_wfc_wifi_only",
-            "test_call_epdg_to_epdg_long_apm_wfc_wifi_only",
-            "test_call_epdg_to_epdg_loop_apm_wfc_wifi_only",
-            "test_call_epdg_mo_hold_unhold_apm_wfc_wifi_only",
-            "test_call_epdg_mt_hold_unhold_apm_wfc_wifi_only",
-            # epdg, WFC, APM, WiFi preferred
-            "test_call_epdg_to_epdg_apm_wfc_wifi_preferred",
-            "test_call_epdg_to_volte_apm_wfc_wifi_preferred",
-            "test_call_epdg_to_csfb_3g_apm_wfc_wifi_preferred",
-            "test_call_epdg_to_3g_apm_wfc_wifi_preferred",
-            "test_call_epdg_to_epdg_long_apm_wfc_wifi_preferred",
-            "test_call_epdg_to_epdg_loop_apm_wfc_wifi_preferred",
-            "test_call_epdg_mo_hold_unhold_apm_wfc_wifi_preferred",
-            "test_call_epdg_mt_hold_unhold_apm_wfc_wifi_preferred",
-            # epdg, WFC, APM, Cellular preferred
-            "test_call_epdg_to_epdg_apm_wfc_cellular_preferred",
-
-            # Non-APM Live WFC tests
-            # epdg, WFC, WiFi only, WiFi strong, cell strong
-            "test_call_epdg_to_epdg_wfc_wifi_only",
-            "test_call_epdg_to_volte_wfc_wifi_only",
-            "test_call_epdg_to_csfb_3g_wfc_wifi_only",
-            "test_call_epdg_to_3g_wfc_wifi_only",
-            "test_call_epdg_to_epdg_long_wfc_wifi_only",
-            "test_call_epdg_to_epdg_loop_wfc_wifi_only",
-            "test_call_epdg_mo_hold_unhold_wfc_wifi_only",
-            "test_call_epdg_mt_hold_unhold_wfc_wifi_only",
-            # epdg, WFC, WiFi preferred
-            "test_call_epdg_to_epdg_wfc_wifi_preferred",
-            "test_call_epdg_to_volte_wfc_wifi_preferred",
-            "test_call_epdg_to_csfb_3g_wfc_wifi_preferred",
-            "test_call_epdg_to_3g_wfc_wifi_preferred",
-            "test_call_epdg_to_epdg_long_wfc_wifi_preferred",
-            "test_call_epdg_to_epdg_loop_wfc_wifi_preferred",
-            "test_call_epdg_mo_hold_unhold_wfc_wifi_preferred",
-            "test_call_epdg_mt_hold_unhold_wfc_wifi_preferred",
-            # epdg, WFC, Cellular preferred
-            "test_call_epdg_to_epdg_wfc_cellular_preferred",
-
-            # Voice Mail Indicator
-            "test_erase_all_pending_voicemail",
-            "test_voicemail_indicator_volte",
-            "test_voicemail_indicator_lte",
-            "test_voicemail_indicator_3g",
-            "test_voicemail_indicator_iwlan",
-            "test_voicemail_indicator_apm_iwlan",
-            "test_call_2g_to_3g_long",
-            "test_call_3g_to_2g_long",
-            "test_call_2g_to_2g",
-            "test_call_2g_to_2g_long",
-            "test_call_gsm_mo_hold_unhold",
-            "test_call_gsm_mt_hold_unhold",
-
-            # long duration voice call (to measure drop rate)
-            "test_call_long_duration_volte",
-            "test_call_long_duration_wfc",
-            "test_call_long_duration_3g"
-            )
 
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.stress_test_number = int(self.user_params["stress_test_number"])
diff --git a/acts/tests/google/tel/live/TelPowerTest.py b/acts/tests/google/tel/live/TelPowerTest.py
index 0ad6d2d..85d5624 100644
--- a/acts/tests/google/tel/live/TelPowerTest.py
+++ b/acts/tests/google/tel/live/TelPowerTest.py
@@ -80,38 +80,6 @@
 class TelPowerTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            # Note: For all these power tests, please do environment calibration
-            # and baseline for pass criteria.
-            # All pass criteria information should be included in test config file.
-            # The test result will be meaning less if pass criteria is not correct.
-            "test_power_active_call_3g",
-            "test_power_active_call_volte",
-            "test_power_active_call_wfc_2g_apm",
-            "test_power_active_call_wfc_2g_lte_volte_on",
-            "test_power_active_call_wfc_5g_apm",
-            "test_power_active_call_wfc_5g_lte_volte_on",
-            "test_power_idle_baseline",
-            "test_power_idle_baseline_wifi_connected",
-            "test_power_idle_wfc_2g_apm",
-            "test_power_idle_wfc_2g_lte",
-            "test_power_idle_lte_volte_enabled",
-            "test_power_idle_lte_volte_disabled",
-            "test_power_idle_3g",
-            "test_power_idle_lte_volte_enabled_wakeup_ping",
-            "test_power_idle_lte_volte_disabled_wakeup_ping",
-            "test_power_idle_3g_wakeup_ping",
-
-            # Mobile Data Always On
-            "test_power_mobile_data_always_on_lte",
-            "test_power_mobile_data_always_on_wcdma",
-            "test_power_mobile_data_always_on_gsm",
-            "test_power_mobile_data_always_on_1x",
-            "test_power_mobile_data_always_on_lte_wifi_on",
-            "test_power_mobile_data_always_on_wcdma_wifi_on",
-            "test_power_mobile_data_always_on_gsm_wifi_on",
-            "test_power_mobile_data_always_on_1x_wifi_on"
-            )
 
     def setup_class(self):
         super().setup_class()
diff --git a/acts/tests/google/tel/live/TelWifiDataTest.py b/acts/tests/google/tel/live/TelWifiDataTest.py
index 819b875..afae331 100644
--- a/acts/tests/google/tel/live/TelWifiDataTest.py
+++ b/acts/tests/google/tel/live/TelWifiDataTest.py
@@ -36,7 +36,6 @@
 class TelWifiDataTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = ("test_wifi_cell_switching_stress", )
         self.stress_test_number = int(self.user_params["stress_test_number"])
         self.live_network_ssid = self.user_params["wifi_network_ssid"]
         try:
diff --git a/acts/tests/google/tel/live/TelWifiVoiceTest.py b/acts/tests/google/tel/live/TelWifiVoiceTest.py
index 645b32e..93d86f1 100755
--- a/acts/tests/google/tel/live/TelWifiVoiceTest.py
+++ b/acts/tests/google/tel/live/TelWifiVoiceTest.py
@@ -111,146 +111,6 @@
 class TelWifiVoiceTest(TelephonyBaseTest):
     def __init__(self, controllers):
         TelephonyBaseTest.__init__(self, controllers)
-        self.tests = (
-            # WFC Call Routing tests.
-            # epdg, WFC, APM, WiFi strong
-            "test_call_epdg_wfc_wifi_only_wifi_strong_apm",
-            "test_call_epdg_wfc_wifi_preferred_wifi_strong_apm",
-            "test_call_epdg_wfc_cellular_preferred_wifi_strong_apm",
-
-            # epdg, WFC, APM, WiFi Absent
-            "test_call_epdg_wfc_wifi_only_wifi_absent_apm",
-            "test_call_epdg_wfc_wifi_preferred_wifi_absent_apm",
-            "test_call_epdg_wfc_cellular_preferred_wifi_absent_apm",
-
-            # epdg, WFC, APM, WiFi Disabled
-            "test_call_epdg_wfc_wifi_only_wifi_disabled_apm",
-            "test_call_epdg_wfc_wifi_preferred_wifi_disabled_apm",
-            "test_call_epdg_wfc_cellular_preferred_wifi_disabled_apm",
-
-            # epdg, WFC, cellular strong, WiFi strong
-            "test_call_epdg_wfc_wifi_preferred_wifi_strong_cellular_strong",
-            "test_call_epdg_wfc_cellular_preferred_wifi_strong_cellular_strong",
-
-            # epdg, WFC, cellular strong, WiFi weak
-            "test_call_epdg_wfc_wifi_preferred_wifi_weak_cellular_strong",
-            "test_call_epdg_wfc_cellular_preferred_wifi_weak_cellular_strong",
-
-            # epdg, WFC, cellular strong, WiFi Absent
-            "test_call_epdg_wfc_wifi_preferred_wifi_absent_cellular_strong",
-            "test_call_epdg_wfc_cellular_preferred_wifi_absent_cellular_strong",
-
-            # epdg, WFC, cellular strong, WiFi Disabled
-            "test_call_epdg_wfc_wifi_preferred_wifi_disabled_cellular_strong",
-            "test_call_epdg_wfc_cellular_preferred_wifi_disabled_cellular_strong",
-
-            # epdg, WFC, cellular weak, WiFi strong
-            "test_call_epdg_wfc_wifi_preferred_wifi_strong_cellular_weak",
-
-            # epdg, WFC, cellular weak, WiFi Absent=
-            "test_call_epdg_wfc_wifi_preferred_wifi_absent_cellular_weak",
-            "test_call_epdg_wfc_cellular_preferred_wifi_absent_cellular_weak",
-
-            # epdg, WFC, cellular weak, WiFi Disabled
-            "test_call_epdg_wfc_wifi_preferred_wifi_disabled_cellular_weak",
-            "test_call_epdg_wfc_cellular_preferred_wifi_disabled_cellular_weak",
-
-            # epdg, WiFI strong, WFC disabled
-            "test_call_epdg_wfc_disabled_wifi_strong_apm",
-            "test_call_epdg_wfc_disabled_wifi_strong_cellular_strong",
-            "test_call_epdg_wfc_disabled_wifi_strong_cellular_weak",
-
-            # WFC Idle-Mode Mobility
-            # Rove-in, Rove-out test
-            "test_rove_in_lte_wifi_preferred",
-            "test_rove_in_lte_wifi_only",
-            "test_rove_in_wcdma_wifi_preferred",
-            "test_rove_in_wcdma_wifi_only",
-            "test_rove_out_lte_wifi_preferred",
-            "test_rove_out_lte_wifi_only",
-            "test_rove_out_wcdma_wifi_preferred",
-            "test_rove_out_wcdma_wifi_only",
-            "test_rove_out_in_stress",
-
-            # WFC Active-Mode Mobility
-            # Hand-in, Hand-out test
-            "test_hand_out_wifi_only",
-            "test_hand_out_wifi_preferred",
-            "test_hand_out_in_wifi_preferred",
-            "test_hand_in_wifi_preferred",
-            "test_hand_in_out_wifi_preferred",
-            "test_hand_out_in_stress",
-
-            # WFC test with E4G disabled
-            "test_call_epdg_wfc_wifi_preferred_e4g_disabled",
-            "test_call_epdg_wfc_wifi_preferred_e4g_disabled_wifi_not_connected",
-            "test_call_epdg_wfc_wifi_preferred_e4g_disabled_leave_wifi_coverage",
-
-            # ePDG Active-Mode Mobility: Hand-in, Hand-out test
-            "test_hand_out_cellular_preferred",
-            "test_hand_in_cellular_preferred",
-
-            # epdg, WFC, cellular weak, WiFi strong
-            "test_call_epdg_wfc_wifi_only_wifi_strong_cellular_weak",
-            "test_call_epdg_wfc_cellular_preferred_wifi_strong_cellular_weak",
-
-            # epdg, WFC, cellular weak, WiFi weak
-            "test_call_epdg_wfc_wifi_only_wifi_weak_cellular_weak",
-            "test_call_epdg_wfc_wifi_preferred_wifi_weak_cellular_weak",
-            "test_call_epdg_wfc_cellular_preferred_wifi_weak_cellular_weak",
-
-            # epdg, WFC, cellular weak, WiFi Absent
-            "test_call_epdg_wfc_wifi_only_wifi_absent_cellular_weak",
-
-            # epdg, WFC, cellular weak, WiFi Disabled
-            "test_call_epdg_wfc_wifi_only_wifi_disabled_cellular_weak",
-
-            # epdg, WFC, cellular absent, WiFi strong
-            "test_call_epdg_wfc_wifi_only_wifi_strong_cellular_absent",
-            "test_call_epdg_wfc_wifi_preferred_wifi_strong_cellular_absent",
-            "test_call_epdg_wfc_cellular_preferred_wifi_strong_cellular_absent",
-
-            # epdg, WFC, cellular absent, WiFi weak
-            "test_call_epdg_wfc_wifi_only_wifi_weak_cellular_absent",
-            "test_call_epdg_wfc_wifi_preferred_wifi_weak_cellular_absent",
-            "test_call_epdg_wfc_cellular_preferred_wifi_weak_cellular_absent",
-
-            # epdg, WFC, cellular absent, WiFi Absent
-            "test_call_epdg_wfc_wifi_only_wifi_absent_cellular_absent",
-            "test_call_epdg_wfc_wifi_preferred_wifi_absent_cellular_absent",
-            "test_call_epdg_wfc_cellular_preferred_wifi_absent_cellular_absent",
-
-            # epdg, WFC, cellular absent, WiFi Disabled
-            "test_call_epdg_wfc_wifi_only_wifi_disabled_cellular_absent",
-            "test_call_epdg_wfc_wifi_preferred_wifi_disabled_cellular_absent",
-            "test_call_epdg_wfc_cellular_preferred_wifi_disabled_cellular_absent",
-
-            # epdg, WiFI strong, WFC disabled
-            "test_call_epdg_wfc_disabled_wifi_strong_cellular_absent",
-
-            # Below test fail now, because:
-            # 1. wifi weak not working now. (phone don't rove-in)
-            # 2. wifi-only mode not working now.
-            # epdg, WFC, APM, WiFi weak
-            "test_call_epdg_wfc_wifi_only_wifi_weak_apm",
-            "test_call_epdg_wfc_wifi_preferred_wifi_weak_apm",
-            "test_call_epdg_wfc_cellular_preferred_wifi_weak_apm",
-
-            # epdg, WFC, cellular strong, WiFi strong
-            "test_call_epdg_wfc_wifi_only_wifi_strong_cellular_strong",
-
-            # epdg, WFC, cellular strong, WiFi weak
-            "test_call_epdg_wfc_wifi_only_wifi_weak_cellular_strong",
-
-            # epdg, WFC, cellular strong, WiFi Absent
-            "test_call_epdg_wfc_wifi_only_wifi_absent_cellular_strong",
-
-            # epdg, WFC, cellular strong, WiFi Disabled
-            "test_call_epdg_wfc_wifi_only_wifi_disabled_cellular_strong",
-
-            # RSSI monitoring
-            "test_rssi_monitoring", )
-
         self.simconf = load_config(self.user_params["sim_conf_file"])
         self.stress_test_number = int(self.user_params["stress_test_number"])
         self.live_network_ssid = self.user_params["wifi_network_ssid"]