Fixing device test by not relying on hardcoded