Test fix and AddAzureEndpoint validation fix