Add multiselect tests and fix minor errors