Comments / adjustments to https://github.com/balderdashy/skipper/pull/18
Refactored Upstream class and made all tests pass again.