Added more tests for the options
Merge branch 'test'