various fixes

• added dns retries for cases when we remove dns entry
• creating relay messages was recently fixed (hop count was +1 from correct values) so now I fixed tests for logging.
• missed some places while I was working with refactoring