Small changes to expand testing from 2 to all connections