ISSUE-15669 Options Test