Add classes and test cases to ImprovedRandom