Refactoring tests
Merge branch 'master' of github.com:mulesoft/osprey-cli