Merge "Improve the selectability of Swift tests"