More determinism for tests please