Tests for Clouds.cs is done and refactorized