Fixed #23078 -- Added some test from https://github.com/django/django/pull/2944
I added the tests from the other PR and included the other AUTHOR