Rainfall: Fix tests