Backported further GenericTypeResolver tests

Issue: SPR-11052