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