Fix report tests.

Add ip address retrieval where possible, slightly altered logic.