Cli, and test utils added.