Test fixes

Fixes some test failures.  Fixes issue #4 in Linux.