Made issue #6 unit tests more deterministic