Changes for UnitTestRandomGenerator