Multiple diameter connections markups and refactoring for UT