Made issue #4 unit tests more deterministic