Address: renamed $domain/$domain_re (clearer)

and added a couple more tests