sorting the connect issue and minimizing tests.