DNAT module unit test and fixes