Added spec test for option being provided twice, other minor stuff