Sweeping !20364 from 21.0 to master. Sweeping !20324 from 21.3 to 21.0.TriggerTest: add a few tests running on data

Sweeping !20324 (merged) from 21.3 to 21.0. TriggerTest: add a few tests running on data

See merge request !20364 (merged)