Refactoring helper test
Refactoring helper test and tests