Went back to User.pcvs method instead of User.all; hid 2 broken TBF tests