Checking maps are not empty before trying to iterate over them (I was getting exceptions when running tests).
Adding info to comment.
Moving address verification batch test into its own class.