Fix(?) non-deterministic testing issue