Also update device.xml in testing