NAT: VPP-1661 - test case cleanup and refactoring