Fix tests
Fix issue with new search server returned JSON