more rng test cleanup