Fix some broken tests

And switch us from standard searches to the more efficient searches in
testing.

Change-Id: I9fda35f40040e44190c122a81f6e3a8662fac8d7
Merge "Fix some broken tests"