Merge "Promote tests because they are stable again: http://shortn/_xVIYIenvfl" into main