Bring #type_name under test
Add skip guard