ElasticSearchHandler/Formatter unit tests update