#19 Yet another attempt to fix some unit tests failing on linux.