Removed need for fake hive server; added tests and methods for Device Wrapper;