Fix/disable intermittent tests