Supplement Vlan unit tests & functional tests