fixed manual-bridging in YAML scenarios

and added unit tests
Merge branch 'jacalvo/fix-manual-bridging'