Fix the following test issues

https://github.com/WindowsAzure/azure-sdk-tools/issues/1529
https://github.com/WindowsAzure/azure-sdk-tools/issues/1530