Make nat test less racy and accurate

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Merge pull request #7832 from crosbymichael/fix-nat-test

Make nat test less racy and accurate