Added matching original iris classes to new ones and testing