Distributed: minor, catch also OOM exceptions
Let tests run on MacOSX