removed lodash and moment dependency, added unit test