fix failing unit tests. Allow better test mocking of DeviceInfo