Data structures updated and elastic search test commented out