Fix entry parsing for non-file information. Space out tests.