Updating tests for address handling change