Added Test Timouts, Fixed issue with connection race while client waiting for a connection