The test changes are perhaps a little bit more involved than expected, because I
had to add a second RegistrarContact which had knock-on effects on other tests.
This does make the other tests better though, in that we're now testing registrars
with multiple contacts (we weren't much before).
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=243827803
3f974902df