Goff wants means tests dropped