Merge "Add tests to add/remove/re-add a NAT."