Code refactory for sprint36

Fixed code review comments for test files for sprint36
https://github.com/Azure/azure-sdk-tools-xplat/pull/1299