structure refactorings
added few tests for helpers