add more models and current user tests