FALCON-927 Refactoring of entity helpers in falcon-regression. Contributed by Ruslan Ostafiychuk