Fix a "United States of Foo" in a test

The country factory used to generate "United States of Foo", but that
was corrected in 81898b1. With the current select2 helper, this is a
silent failure (the select2 menu is left open) as it was already the
default.
better/faster capybara select2 macros

Existing select2 (and variants) used sleep(1) to wait for the select2
dropdown to appear and then executed some javascript to select the
desired option.

This commit replaces that with a standard capybara page.find(...).click.
As well with avoiding the sleep(1), this raises an exception if the
desired option doesn't exist.

Fixes #4043