Fixing some parts of the ut problem.
Merge branch 'dev' of https://github.com/AzCiS/azure-sdk-tools.git