Fix tests
rename Attr -> AttrDef. and flatten AttrScore