Made requests required for tests.

Also minor formatting and commenting tweaks in response to Charles's comments.