Test and fix change address selection