On two classes of Banach spaces with uniform normal structure