More tests for util.
Simplifying tests for util.
Tests for search.
More tests for search.