DRY up spec.
DRY up spec.
Merge branch 'develop' into topic/request-with-body

Conflicts:
	core/src/test/scala/org/http4s/MockServerSpec.scala