Unit tests added for cli and server
Merge branch 'develop' of https://github.com/pssst/pssst into develop