Continue work on tests
Merge branch 'master' of github.com:jworley/dockermon