Make test code format consistent
Make sure that the negotiator always returns a match in the form it was found in choices

If the negotiator returned a default, it returned the canonicalized form, not
the form it found in the list of choices.