Issue #1089: Fix test_pyz_as_external_file.py.
Issue #1089: Fix a couple of failing tests on Linux.
Merge pull request #1091 from matysek/develop

Fixed a couple of failing tests from issue #1089.