AddressSelect refactoring
Integration test for AddressSelect