Merge "Use addCleanup when running swift scenario tests"