Testing and User model updates