[Backport 9.0] yaml tests: more improvements to branching logic

[Backport 9.0] yaml tests: more improvements to branching logic #2284