Merge "Tweak testCloseDuringConnect"