+ Small changes, e.g. ValueUri -> AttributeUri
+ Adapted consistency tests