connect_gateway() - add snat and tests -- cleanup