Added back AttributeConstraint and AttributeExistsContraint plus their tests