Cloud testing updates
Merge pull request #752 from umaar/cloud-testing-updates

Cloud testing updates