Added `collection_select` and `grouped_collection_select`

and matcing tests.