fixed failing tests
mid flow - parking
Build from multiple mapped templates
mapping to multiple templates initial work
merge fix