[CB-2200] Remove test dependency on deprecated device.name