Avoid getDefaultInstance method name in tests

This is split from I04767f2 to make it easier to review.

Change-Id: I712432649c38e5e8cc3148e5c12001b1cf33c6ed
Merge "Avoid getDefaultInstance method name in tests"