Re-enable Randomize for test