* Added e2e tests for device management

* Addressed review comments given by rohitsardesai83

* Resolved conflicts and made changes accordingly