Move simple-vlan specific code from deployment tests to driver