refactoring cli in progress

four tests are failing