[wcloud]: More testing / fixes