Handle 0-option criteria
Remove duplicate test module from a bad merge