Fixing most of the eventually errors by explicitly specifying Exception
Made the spec work SOMETIMES again... higher timeout does not help #681