Merge "Add cases for Swift scenario test"