Code clean-up and remove shadowing
Merge pull request #13393 from rallytime/cloud_test_cleanup

Code clean-up and remove shadowing