Option aware random tests fixed: results were strange because of high variability