diff --git a/.travis.yml b/.travis.yml
index 7db78595..b8095f8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -215,6 +215,9 @@ script:
 - if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi
 - if [ "$e2e" = true ]; then $gam print mobile; fi
 - if [ "$e2e" = true ]; then $gam print devices; fi
+- if [ "$e2e" = true ]; then export sn="$jid$jid$jid$jid$jid-$(openssl rand -base64 32 | sed 's/[^a-zA-Z0-9]//g')"; fi
+- if [ "$e2e" = true ]; then $gam create device serialnumber $sn devicetype android; fi
+- if [ "$e2e" = true ]; then $gam print devices filter "serialnumber:$jid$jid$jid$jid$jid-" | $gam csv - gam delete device ~name; fi
 - if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi
 - if [ "$e2e" = true ]; then $gam report usageparameters customer; fi
 - if [ "$e2e" = true ]; then $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins; fi
diff --git a/src/gam/gapi/cloudidentity/devices.py b/src/gam/gapi/cloudidentity/devices.py
index 204f3813..fbd5053e 100644
--- a/src/gam/gapi/cloudidentity/devices.py
+++ b/src/gam/gapi/cloudidentity/devices.py
@@ -47,11 +47,14 @@ def info():
     ci = gapi_cloudidentity.build_dwd()
     customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
     name = sys.argv[3]
+    if not name.startswith('devices/'):
+        name = f'devices/{name}'
     device = gapi.call(ci.devices(), 'get', name=name, customer=customer)
     device_users = gapi.get_all_pages(ci.devices().deviceUsers(), 'list',
         'deviceUsers', parent=name, customer=customer)
-    print(device)
-    print(device_users)
+    display.print_json(device)
+    print('Device Users:')
+    display.print_json(device_users)
 
 def _generic_action(action, device_user=False):
     ci = gapi_cloudidentity.build_dwd()
@@ -169,9 +172,7 @@ def print_():
                 titles.append(a_key)
         csvRows.append(device)
     if sortHeaders:
-        display.sort_csv_titles([
-            'name',
-        ], titles)
+        display.sort_csv_titles(['name',], titles)
     display.write_csv_file(csvRows, titles, 'Devices', todrive)