Merge "Add tests for Swift in orchestration"