+ Reflect actual number of searches, + Refactor functional OR specs
+ Refactored a few tests