I think you are correct re: means testing. I believe that is already done for Medicare.
I will add...I disagree with it. If a person, no matter how wealthy, pays into SS...they are entitled to the benefit. Otherwise...it is just more wealth distribution.
Let's be honest.
It's theft.