tg_user was renamed to user
Make flake8 happy
Upgrade tests for model changes