Merge "Testfix: Expect 4 additional TOSCA `Input` fields"