Fix tests. Important change: Payload null instead of slice of size 0.