Connectivity workaround for tests