Fix tests
Merge branch 'dev' of https://github.com/AzureRT/azure-sdk-tools into dev