Further debug
further debug
Fix elasticsearch activity/situation store tests by using the singleton from the ServiceRegistryUtil