Merge "Clean up RandomTest."