Added tests to CLI. WIP.