More test tweaking
Minor exception improvement for the AddressPicker
Minor testing tweaks
More testing tweaks