test refactoring
element management refactored