Refactored es clients to increase testabiltity, added some tests