Fixing #1263: apply_remote test takes too long
Fixing #1234: TCP runs fail: Transport endpoint is not connected