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

[Backport 9.1] yaml tests: more improvements to branching logic #330