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

This reverts commit edd15a33ac0b3118757b4283a696096a38869df0. Apparently getting directory listings breaks with that commit in, we had to revert it for Cloud9.

@sergi can you merge this or have a look?