Task #794 Reworked NAT unit tests