Improved Response spec

The old one was never intended to work.