Remove the default values for gateway/port
Clean up the test case