Merge "Update unit test related to vyos_vrouter"