Test refactoring
Test refactoring

We decoupled tests for `cf login` orgs and spaces

[#166938709](https://www.pivotaltracker.com/story/show/166938709)

Co-authored-by: Brendan Smith <8591d66a77fc00d117843ef4d4bc1fbb80fd377f@pivotal.io>

cloudfoundry/cli,cloudfoundry/cli,cloudfoundry/cli