Change certain cmds to single input, set type for watch-address, update tests.
Merge pull request #103 from evoskuil/develop

Change cmds to single input, set type for watch-address, update tests.