Added more tests for getIp4Address(), clean up as well