Code clean-up and remove shadowing

Removed some left-over print statements and removed some shadowing in cloud test files.