Fixed DeviceSelectionTests