Fixes index/search related tests