Patch unittests when calling _validate_device

Fixes some develop test failures.