fixed failing headpin cli tests

please, check it once.
system group test affected due to refactoring