Modified options.go to allow for non-failure in testing.
Added options_test.go to test options a bit.
Merge branch 'options_testing'

* options_testing:
  Modified options.go to allow for non-failure in testing. Added options_test.go to test options a bit.