Make nat test less racy and accurate