Feature/850 addr verif batch test

Fix for #855. (Also #599 - just a small text change.)