fixed options bug
get tests to pass
Merge pull request #964 from shackbarth/testfix

Testfix