Fixing search tests
Buncha test fixes