Fix issue with the User ForeignKey
Moar tests