added options spec and beefed up request spec