Fixes type-comparison for non-directly inherited types, limits superset to one result only
Updates type tests for singular superset