Fixed CloudService unit tests