Make option field null
Default points if no option is specified
Handle 0-option criteria

Remove duplicate test module from a bad merge

More tests