- Tests still fail, but migration works OK
- Fixing set_tenant to None