Adjusted a unit test to check info field correctness.  Minor code cleanup.