CFY-54 created setup and teardown, added elasticsearch as dependency, general refactoring