Fix test I broke during merge conflict resolution

Change-Id: Ia2526691fb58b70c1d77f5e2fd10c4f35631c534