improving the code readability
adding the "active" flag
Adding for the device manager the ability to chose test and deploy