Jeffjo/add request options

Address #44 and fix some tests that were broken