Created Attribute.ID and Attribute.ModelID constructors.  Fixed tests to handle these properly.