Better tests.

Motivation to change search mechanism.