Merge "Promote passing quick switch tests"