Added Elastics to the list of dependencies.
Still failing tests! minor refactoring