Fix inconsistent test fails - insignificant ordering