Fix tests for new user model
Fix for admin