More granular automation.

Handles custom addresses for the test runner, handles IPv4