Merge "Improve cleanup after Swift testing"