Fixed #22661 -- Move makemigrations tests to the proper class