Fixing up users tests now