Fix test paths
Remove Cli class methods, add tests for Cli.