commit 14ce9128c49fbb29e7f04ee6b43e0ded958dac65
author Keith Haddow <haddowk@chromium.org> Thu May 17 13:50:27 2018 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed May 23 14:23:58 2018 +0000
tree bd358501deb49439675b322b19c44128542b56ea
parent 6f0c950156f676c1a7a4f0f76ccac9f655ebc6b3

[autotest] Uprev CTS version to 7.1_r16

TEST=None
BUG=b:68778082

Change-Id: I2473c66312ee5deb1eb8bfb85a0b28440125c14e
Reviewed-on: https://chromium-review.googlesource.com/1064884
Commit-Queue: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Trybot-Ready: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
(cherry picked from commit 3d8d77e0857e79b5fa531c08dd3ef08dec6ca308)
Reviewed-on: https://chromium-review.googlesource.com/1069665
Reviewed-by: Keith Haddow <haddowk@chromium.org>

server/site_tests/cheets_CTS_N/cheets_CTS_N.py

diff --git a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
index 49de5f3..e679178 100644
--- a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
+++ b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
@@ -24,8 +24,8 @@
 # Public download locations for android cts bundles.
 _DL_CTS = 'https://dl.google.com/dl/android/cts/'
 _CTS_URI = {
-    'arm': _DL_CTS + 'android-cts-7.1_r15-linux_x86-arm.zip',
-    'x86': _DL_CTS + 'android-cts-7.1_r15-linux_x86-x86.zip',
+    'arm': _DL_CTS + 'android-cts-7.1_r16-linux_x86-arm.zip',
+    'x86': _DL_CTS + 'android-cts-7.1_r16-linux_x86-x86.zip',
     'media': _DL_CTS + 'android-cts-media-1.4.zip',
 }
 

server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
index 7fbb1b7..be50e43 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAadbHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
index c1105fa..a1300a4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAbiOverrideHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
index baf0fc0..6f7cc30 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccelerationTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
index 4ed66ff..2f3d81c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccessibilityServiceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
index 2a22107..307ab00 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccessibilityTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
index 92bddf0..6aa3be1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccountManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
index 8a22ffa..2daa947 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAdminTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
index 527d9bb..3bbd4c1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAlarmClockTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
index c0e43c8..35ce67d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAndroidAppTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
index 39ff01a..2520602 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAnimationTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
index ea5f41a..885b83e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppSecurityHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
index 301164f..30c8295 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
index 2c12789..1990a28 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppUsageHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
index 7b32265..4d627a5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppWidgetTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
index c197133..0d68c55 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAslrMallocTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
index c2bf9d8..42e1744 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAssistTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
index ef42dbc..a78b6a7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAtraceHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases
index 0bd3511..941e313 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBackupHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
index ea9887d..f669930 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBackupTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
index d301e5e..d996017 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBionicTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
index 1529b45..6244043 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBluetoothTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
index 27224ad..5f5d71a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCalendarcommon2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
index d577a77..7e667db 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCameraTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
index 6ffa39f..4f5cef5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCarTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
index 24ce775..2c93a72 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCarrierApiTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
index e6ffe55..ec035e3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCompilationTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
index 4a8c59e..68332fe 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsContentTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
index 1d6759f..c63b352 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCppToolsTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
index 54be1ca..abfcc92 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDatabaseTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
index 688ad9c..431d542 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDeqpTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=86400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
index 6ca2129..ebef07e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDeviceAdminUninstallerTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
index 169ac19..d3b7405 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDevicePolicyManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=7200)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
index dd2cc4d..e2b5f56 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDisplayTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
index 396752e..bfbb7f8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDpiTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
index 49393ca..466fe2e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDpiTestCases2 of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
index 6cd6914..6655719 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDragAndDropHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
index 6827f5f..9d1f26e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDramTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
index ea64d17..f14e836 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDreamsTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
index 2009368..527d501 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDrmTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
index 5235ad9..b004bba 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDumpsysHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
index 1932576..5ad6b6d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsEffectTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
index b5eaa42..fceaa66 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsExternalServiceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
index 7fb1304..de54aeb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsFileSystemTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=9000)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
index 54bb399..8b0f850 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsFragmentTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
index 02ddca3..8de66f9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsGestureTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
index 157eb72..a59bd1e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsGraphics2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
index 598bfa5..181277a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsGraphicsTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
index 2cd5094..0660f41 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHardwareTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=10800)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
index 91af2ff..75fbc82 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHostsideNetworkTests of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
index e9680e4..c36aed3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHostsideNumberBlockingTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
index e36d8c8..2b05f24 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHostsideTvTests of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
index 9509bec..8869b29 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsIcuTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=7200)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
index 56a5f33..94c22cd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJankDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
index c1e082e..3d465aa 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJdwpSecurityHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
index f7475ec..539cb12 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJdwpTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
index 122e850..26f8768 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJniTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
index 0b53099..e135beb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJobSchedulerTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
index c850c03..f4e475d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsKeystoreTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
index a2ea4e6..cd2f671 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLeanbackJankTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
index 9f6c1bb..84d2b03 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreLegacy22TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
index 85f0d67..6832296 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreOjTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
index 1101cd5..b58982a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreOkHttpTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
index 82f9951..bb03707 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
index 7cefa7f..5e46f0e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLocation2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
index 4c58543..2437673 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLocationTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
index 1ed14fd..e4014bb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMediaStressTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=True,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=21600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
index bb7a4d6..2dbc4bc 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMediaTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=21600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
index 38fab20..590eaeb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMidiTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
index 6c379ec..80cb6d5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMonkeyTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
index 95f7577..fe634f1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMultiUserHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
index a967601..aa86749 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMultiUserTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
index 8671882..39daaa5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNativeMediaSlTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
index 33b9658..d97ddf8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNativeMediaXaTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases
index b38a7cf..1832aac 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNativeNetTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
index 90e7859..5dc909c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNdefTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
index 71d16c9..d35ed2a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigAttributeTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
index 435190a..7bf1a4e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigBasicDebugDisabledTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
index 7bf614f..a24c149 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigBasicDebugEnabledTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
index 3ade0c3..c89dd67 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigBasicDomainConfigTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
index 737c262..4f89023 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigCleartextTrafficTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
index b2168a1..2dba5e0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigDownloadManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
index e9ba04e..25461c3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigInvalidPinTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
index 21e65ca..37f8dcd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigNestedDomainConfigTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
index a802f6c..4a25b4c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigResourcesSrcTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 131e894..3f4b540 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index a4ba51c..97a4f63 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 45b5048..41fae37 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
index 9761f6b..987bb40 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -35,4 +36,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
index 65ea13c..1232ac5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetTestCasesLegacyApi22 of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
index 7ad8f20..723709b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetTestCasesLegacyPermission22 of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
index b1b34e7..a7178ba 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOpenGLTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
index e92cd7f..ffc6d00 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOpenGlPerf2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
index 4ec5ec7..701787a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOpenGlPerfTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
index 71b6b71..93188bf 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOsHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
index 0c38341..82e7675 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOsTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
index a7d8d1f..160fb33 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPermission2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
index c7f8504..b0d3004 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPermissionTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
index da66440..72af793 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPreference2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
index 3f5bc40..281a25c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPreferenceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
index d1e070a..4b4a217 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPrintTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=10800)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
index 469e71b..8b06397 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsProviderTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
index 15e074f..6e7e465 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRenderscriptLegacyTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
index 9b3fd54..40f25bb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRenderscriptTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
index 7d93c91..d573f87 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRetailDemoHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
index de121ea..3cfa341 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRsBlasTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
index 05920ac..692bfca 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRsCppTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
index 4e5c02f..f1f3949 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSampleDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
index fa5ad6a..9dc96ec 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSampleHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
index e9f826d..fbc8dba 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSaxTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
index 41dbb8b..2ca0fec 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSecurityHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -32,4 +33,4 @@
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
index 2839f35..150f191 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSecurityTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
index fd432cd..3110c89 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsServicesHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
index 2a5e299..0b14adf 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsShortcutHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
index 54c2db3..babc049 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsShortcutManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
index d7c6b06..7710a2d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSignatureTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
index 44c2f9f..9b37149 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSimpleCpuTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
index 23c5d4c..ad3cf06 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSimpleperfTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
index ece46a0..6090114 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSpeechTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
index 92ce72f..5ece91a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSustainedPerformanceHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
index a94f88a..f2fcd98 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSystemIntentTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
index c7c0263..49e7f7a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSystemUiHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
index 33a0ad3..d2f081a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSystemUiTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
index 8f9e8f7..7e8e75b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelecomTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
index af8b1e2..1589499 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelecomTestCases2 of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
index a18bace..68fbefe 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelephony2TestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
index 4dd053d..dd6e69a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelephonyTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
index 794df95..09bbaf8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTextTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
index b16571d..c65340f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTextureViewTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
index b994429..8c7977f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsThemeDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
index 845cb42..61e7424 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsThemeHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=21600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
index 5b708f4..59d0114 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsToastLegacyTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
index 51d9e01..5481e58 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsToastTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
index f8ebfc8..f4e1d94 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTransitionTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
index 6e122d9..7d8a3b9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTrustedVoiceHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
index 3a726d8..11d3ec9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTvProviderTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
index 6bafef9..60490b3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTvTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
index 1889795..a23d87c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiAutomationTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
index 996641b..86e9e03 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
index 63ca540..dd26160 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
index 29393fb..32e3596 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiRenderingTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
index 757ca60..747d838 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUidIsolationTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
index 422f376..00943c2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUsageStatsTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -35,4 +36,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
index 9502f83..0cccdd7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUsbTests of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
index 1349e8a..6a93a1c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUtilTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
index bbf8585..29ddb66 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVideoTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
index 08a551d..01be892 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsViewTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
index 2e51109..81b4c43 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVmTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
index bc48454..a375d88 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVoiceInteractionTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
index 0fe875e..dc3b447 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVoiceSettingsTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
index 8105838..bebef13 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVrTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
index 6379963..481fd56 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsWebkitTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
index 4b47301..e4029dd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsWidgetTestCases of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf

diff --git a/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
index 44b4124..d845b55 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
@@ -16,11 +16,12 @@
 DOC = ('Run module vm-tests-tf of the '
        'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=7200)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
index a2c03d9..80a57d4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAadbHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
index 62d9521..8d374e0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAbiOverrideHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
index 5c75cbf..df550f9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccelerationTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
index 78acac5..5953f94 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccessibilityServiceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
index e915c78..2423e2e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccessibilityTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
index 96b652e..10e7753 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAccountManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
index 17e2e69..f468594 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAdminTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
index d2f85d9..8645c3d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAlarmClockTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
index f1f812a..98d0709 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAndroidAppTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
index ed4a52f..e008d75 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAnimationTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
index 6a5c080..b53def7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppSecurityHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
index 565af6c..51c4913 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
index 1dc7695..fffe581 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppUsageHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
index 814bc0c..7606225 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAppWidgetTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
index 94e33dd..df2c858 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAslrMallocTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
index 60e8ccf..1b776a8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAssistTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
index d3f6e41..41056f4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsAtraceHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases
index 3c56d54..a159ea0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBackupHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
index b259332..ef7b9b0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBackupTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
index 8886613..fb9c0b8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBionicTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
index dff2a50..2532f05 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsBluetoothTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
index d2edc5f..865212e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCalendarcommon2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
index 8f50c97..09dd543 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCameraTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
index da1f6ea..1ae60d9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCarTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
index 3bd3ae5..b263374 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCarrierApiTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
index c289bac..1c2b5cd 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCompilationTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
index f115127..f1d34da 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsContentTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
index 721b532..41e83cf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsCppToolsTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
index 798f55a..943bd7f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDatabaseTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
index e9314fb..3e8d041 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDeqpTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=86400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
index 3ee6226..a481eb2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDeviceAdminUninstallerTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
index 38bc19f..a4456d4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDevicePolicyManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=7200)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
index 6237ff1..dde49c7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDisplayTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
index 9be4191..4294478 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDpiTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
index fcab9ab..e714f61 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDpiTestCases2 of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
index 73e562e..d1933ce 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDragAndDropHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
index 060da73..cb6720b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDramTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
index 0f60b29..c43df4e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDreamsTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
index bae30c6..3290829 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDrmTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
index 03a5366..877d819 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsDumpsysHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
index b4ab067..7ba13b3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsEffectTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
index c8e865c..0bb80ad 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsExternalServiceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
index a3046e5..07014e6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsFileSystemTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=9000)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
index 207c05d..72b2e96 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsFragmentTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
index e1576d1..ad0c1fe 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsGestureTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
index e171908..dd9b13e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsGraphics2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
index 36bb6a7..8679770 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsGraphicsTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
index 08ed74c..5809855 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHardwareTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=10800)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
index ba84e6a..f85ade0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHostsideNetworkTests of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
index 725c8bb..8978f76 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHostsideNumberBlockingTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
index 7c24310..b0102cc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsHostsideTvTests of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
index ee2a1ef..a173f64 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsIcuTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=7200)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
index 224f903..2e60515 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJankDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
index 6ae0821..043e051 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJdwpSecurityHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
index fea22f7..58cd3bd 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJdwpTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
index c931d66..aa7de7e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJniTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
index 93c6c9e..db73126 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsJobSchedulerTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
index db357df..0786ca4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsKeystoreTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
index 7e7a223..89b32cf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLeanbackJankTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
index f2a0902..70e6dea 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreLegacy22TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
index 98dddf2..df2dd49 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreOjTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
index 9aa3383..66043de 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreOkHttpTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
index 6316b01..aaf4278 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLibcoreTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
index 1838ec4..34e9ab7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLocation2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
index eac71dd..b73ddd6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsLocationTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
index 06635a8..53ce7d8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMediaStressTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=True,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=21600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
index eb81083..b0e019d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMediaTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=21600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
index 500f074..bcb0cad 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMidiTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
index 0a17b3c..9e7cb1d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMonkeyTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
index e67dfe1..dd6fd0c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMultiUserHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
index ddb4821..820a8ea 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsMultiUserTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
index d84e5d7..5ef2238 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNativeMediaSlTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
index 47fbb65..a11fd28 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNativeMediaXaTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases
index 08d271b..d9b15d3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNativeNetTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
index e06a741..2531b37 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNdefTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
index 3903fe5..a246ef1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigAttributeTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
index eba5d12..b68c613 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigBasicDebugDisabledTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
index 0a7a14a..e5c945f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigBasicDebugEnabledTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
index ae39c79..9ca8d63 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigBasicDomainConfigTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
index 620a5b7..a3a4932 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigCleartextTrafficTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
index fd5e6c3..53ee738 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigDownloadManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
index 4fa0750..147ddb6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigInvalidPinTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
index 8b936ae..87288ba 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigNestedDomainConfigTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
index 3a5ff2a..2a3b4dc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecConfigResourcesSrcTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index ed3e3f8..023eaae 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 01c80ea..c6e6870 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 6e973e2..f9ee0c7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
index fc40735..f0dbb2a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -35,4 +36,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
index fbdce80..08a9863 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetTestCasesLegacyApi22 of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
index f927cb6..802ad44 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsNetTestCasesLegacyPermission22 of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
index f4653ee..e56f85e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOpenGLTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
index 90601ac..81dfe71 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOpenGlPerf2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
index f64f547..6371c27 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOpenGlPerfTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
index 0896cd3..2bd03fb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOsHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
index 86ec3e9..e82610d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsOsTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
index 9f2095b..f5cdf66 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPermission2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
index b95d3e8..1c20260 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPermissionTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
index 443eec1..69bce9b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPreference2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
index 910b96b..3520335 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPreferenceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
index 69cabe3..4cc3fe0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsPrintTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=10800)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
index a1c901e..319d7dc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsProviderTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
index 2190f05..36fe5a8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRenderscriptLegacyTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
index bbc846b..cb9fdc1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRenderscriptTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
index 8abece0..0c84863 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRetailDemoHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
index a401f5e..751e789 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRsBlasTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
index fe7050e..557f057 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsRsCppTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
index 6ba1f9a..cc5c34d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSampleDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
index 0429d71..5f99c65 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSampleHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
index 06012e8..bcb1f73 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSaxTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
index b2968cf..41964c3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSecurityHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -32,4 +33,4 @@
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
index da74e99..76cb974 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
@@ -11,17 +11,17 @@
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'LONG'
-PRIORITY = 50
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSecurityTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -32,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
index e831332..556d666 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsServicesHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
index 2c95f6d..5070e14 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsShortcutHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
index a305af5..0083d11 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsShortcutManagerTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
index a2b76a2..0d3dc21 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSignatureTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
index 9349e7c..81bd5c6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSimpleCpuTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
index 8a49cf0..9b3d96c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSimpleperfTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
index bda82fd..c084f63 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSpeechTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
index 08ed652..ab4abaf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSustainedPerformanceHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
index 3aea34c..a2f0fd3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSystemIntentTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
index e090e11..9e0030c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSystemUiHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
index c691605..5b19f42 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsSystemUiTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
index 073fcf9..dabd81d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelecomTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
index e36f931..44e9bc4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelecomTestCases2 of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
index e7916cf..eb505ac 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelephony2TestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
index 869bbf6..f5376e2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTelephonyTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
index a8f2207..5831ac6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTextTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
index ce460a9..551c402 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTextureViewTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
index 82b8c21..1cdaad1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsThemeDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
index e2e27fa..ab4b8e4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsThemeHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=21600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
index e551b48..50efa80 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsToastLegacyTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
index ab40aad..e81efdf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsToastTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
index a3e171b..df81187 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTransitionTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
index 7594bdd..6cc7745 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTrustedVoiceHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
index 96e4e73..f1f5caa 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTvProviderTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
index 4d6e32f..e73b7f2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsTvTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
index ee0e390..0b4ca4d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiAutomationTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
index 5addba2..98eb2cc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiDeviceTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
index 62f8a79..2e65c29 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiHostTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
index ebde738..636e1ac 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUiRenderingTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
index ada0273..db2de5a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUidIsolationTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
index 0bebbc8..89bd72f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUsageStatsTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=10,
         needs_push_media=False,
@@ -35,4 +36,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
index b37d7e4..dcea484 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUsbTests of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
index a1bb825..251577d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsUtilTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
index cbba6db..5d4269f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVideoTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
index 51f607b..788b285 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsViewTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
index f615056..c0bbc16 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVmTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
index d969a79..bf26740 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVoiceInteractionTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
index 61385f5..6e8c68e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVoiceSettingsTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
index 9272b59..3798a0d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsVrTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
index 539e28e..b2d0dd2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsWebkitTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases

diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
index b6e9102..8a86553 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
@@ -16,11 +16,12 @@
 DOC = ('Run module CtsWidgetTestCases of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)

server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf

diff --git a/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
index 29b45de..af7bbd3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
@@ -16,11 +16,12 @@
 DOC = ('Run module vm-tests-tf of the '
        'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
+
 def run_CTS(machine):
-    host = hosts.create_host(machine)
+    host_list = [hosts.create_host(machine)]
     job.run_test(
         'cheets_CTS_N',
-        host=host,
+        hosts=host_list,
         iterations=1,
         max_retry=3,
         needs_push_media=False,
@@ -31,4 +32,4 @@
         retry_manual_tests=True,
         timeout=7200)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)