Speed up slow unit-test.
Fix search scoring and limiting.