Updated the tests for Clouds