Hopefully fix sometimes failing mercury tests