Added tests for options