Fixed #21280 - Added test for a921f06.

This commit also lays the groundwork for future tests for the
makemigrations command.