Improves handling of forwarded headers. Fix #2094

Rather than changing these two tests, duplicate them, one testing for the forwarded header, the other testing for the x-forwarded-proto header.