- Simplified logic by taking advantage of built-in PSA code
- Updated user model tests and removed django_dynamic_fixture