[ATR-19927] More missing EDM entries from other tests

Following on from !24245 (merged)

Fixes more instances of missing EDM configuration - not fixing taus (handled by @carquin - thanks Edson)