Add test for belongsTo fetching to determine type, fix type mapping for verifications