Small test cleanups from b63089d.

There was nothing there worth holding up the review over, but there
were a couple little things in the test that confused me.

Change-Id: I85c9c1bdb12de210c198d0d38404a1cf9f73adbb
Merge "Small test cleanups from b63089d."