Fixed some spurious test failures resulting of some bits that were
specific to the way I was developing on mac.