Added additional, reworked test for empty/nonempty files.