Fix report tests.

Add ip address retrieval where possible, slightly altered logic.
nope, I finally decided to put both inside so it is possible to check against anything, host or ip.