US413: More address select test tweaks