AGP-420: allow hyphen and underscore in evaluator
AGP-420: add tests and , fix test environment