Modify regex, clean code, add tests #140

Job	Run time
test-mysql (3.9, Django>=4.2,<4.3, false)	14m 8s
test-postgres-elasticsearch7 (3.8, Django>=4.2,<4.3, false)	7m 36s
test-mysql (3.12, Django>=5.0,<5.1, false, --parallel, mysql:8.1)	13m 51s
test-postgres (3.8, Django>=4.2,<4.3, false, --parallel)	7m 50s
test-sqlite (3.10, Django>=4.2,<4.3)	10m 40s
test-postgres (3.11, Django>=5.0,<5.1, false, emailuser, --parallel)	8m 10s
test-sqlite-elasticsearch8 (3.10, Django>=5.0,<5.1, emailuser)	6m 26s
test-postgres (3.12, Django>=5.0,<5.1, postgres:15, notz, false, --parallel)	8m 12s
test-sqlite-opensearch2 (3.9, Django>=4.2,<4.3, false)	5m 49s
test-postgres (3.10, git+https://github.com/django/django.git@stable/5.0.x#egg=Django, true)	8m 10s
test-postgres (3.10, git+https://github.com/django/django.git@main#egg=Django, true, postgres:lat...	8m 11s
coverage	0s
	1h 39m 3s

Provide feedback