Merge "Add local ip scenario tests"