The options stuff also looks OK, but are they supposed to be used anywhere, e.g. in building request? Or is that all happening automagically? Should we be extending an *ExpectTest to see how these get added to an HTTP request?