Fix some tests.

Added utility for pulling together some loopy address data