fixed broken search integration and unit tests