Hopefully made the tests more deterministic