mypy
Test cleanup following PR #6860
#6925
Merged

Loading