Updated comm service test, added device service.