Fix for cloud provider tests
Merge pull request #378 from psav/fix_cloud_prov_tests

Fix for cloud provider tests