move test setup into setup/teardown phase
wip
Merge branch 'master' of https://github.com/juju/juju into 119-version-tests
Merge branch 'master' of https://github.com/juju/juju into 119-version-tests
Responding to review feedback
Merge pull request #229 from davecheney/119-version-tests

version: add more unit tests