Start fixing ordering for users (in tests)