Handle 0-option criteria (includes DB and schema migrations)
Remove duplicate test module from a bad merge
Update and centralize analytics events for peer/self