#4137 add testing for null Fields and actions
#4137 Tidy introspector code