knocked out a bunch more user related tests