Fixed a few small issues. Added clean-up to vlan and bridge tests.