Fix test pipeline issues

I'm gonna work on this

Ready for review

Addressed all remarks apart from one for which I've created a followup ( 🐛 Fatal error with email notification if user has no email address Active ).

Changes look good to me, thanks.
I did some manual tests and didn't any other issues/regressions.

Automatically closed - issue fixed for 2 weeks with no activity.