Updating per PR comments
* Adding unit tests
* Moving activate attribute to host