Elan test fixed. DataStructureWithConstraints deleted.