Allowed dashed options as per #32
Moved full test to dashed options
Merged from DEV