fixing failing test and also fixing the equals and hashCode methods on the DataId class