Fixed code and tests related to previous pull request (redux)

Previous pull request resulted in these failures:

https://travis-ci.org/geopython/OWSLib/jobs/43545711#L415

https://travis-ci.org/geopython/OWSLib/jobs/43545711#L442

Which have been addressed in this new pull request.  Did a rebase so that this PR does not rewrite history.