streams: use finished for pump
Re-use existing compay logic for pump by using finished. Also cleans up logic a bit.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Re-use existing compay logic for pump by using finished. Also cleans up logic a bit.