Removing test optimisations to see if this causes random failures