Simplify CLI
Remove un-used cli tests