Move VLAN-specific code out of deployment tests