[UnitTests] Fixed some unreliable tests.
The search collector tests never really worked well. There is no real
gain in investing work there - the whole search collector is going to
be thrown away soon.