Add some retry in tests