Cli is mostly tested.
Fixed method signature.