[9.20] fix: test: minor fixes for extra_artifacts detection
Some omissions of !9426 (merged) discovered during the backports
Backport of MR !9739 (merged)
Some omissions of !9426 (merged) discovered during the backports
Backport of MR !9739 (merged)