method name refactoring, better port addressing in tests