Altered the test criteria slightly to include OPTIONAL for the choice of VLAN. Code reformatted, etc.