[task] removed unnecessary Group mock from test
[refactor] little refactoring for better reading of the code
Merge pull request #168 from davidmoebius/builder_header

Builder header