modified more tests adapt to removal of elastic search implementation