Logic and race test fixed
Logic and race test fixed

geeknoid/istio,istio/istio,geeknoid/istio,istio/istio,geeknoid/istio,smawson/istio,istio/istio,geeknoid/istio,smawson/istio,geeknoid/istio,istio/istio,smawson/istio,istio/istio,smawson/istio,geeknoid/istio,smawson/istio,smawson/istio