Fix tests for device changes.