use more efficient IP selection per egilburg's suggestion; break test out in attempt to appease travis