Fixes to make the tests run under Debian as well as Ubuntu.