Fix model names
Update model associations
Update migration
Add deleted_at to user spec