test refactoring, new helpers
test refactoring, new helpers