Fixes for mocking, right now has a bug where all remote device as equal