Preliminary removal of TestUserDAO and UserProvider
- Disambiguations of User and auth.User