Corrected tests -- OutputNameEntry is no more.