Added a couple tests for new options and a bug.