pytest 6+/python 3.9+ cleanup - type hint conversion

pytest 6+/python 3.9+ cleanup - type hint conversion #291