Minor changes to avoid non deterministic test