Refactor and consolidate mixins (#1564) #2450

Job	Run time
Check flake8	18s
pytest (unclaimed)	2m 41s
pytest (claimed)	3m 21s
Process test coverage (unclaimed)	18s
Process test coverage (claimed)	22s
	7m 0s

Provide feedback