Added tests to CLI. WIP.
Merge branch 'develop'