Update returnOneOf with more robust randomness