Tweak test data to avoid ambiguities.

Change-Id: If708a0c5336809c34d20ee2de35b1b9260c3a64c