Means-testing is where a lot of the cost of social welfare systems comes into play, and where nearly all of the moral hazard starts (making it more expensive to work than to not work). It's best to keep means-testing out of it altogether.