Looks good again... More random testing