Refactor the network tests to rspec 3, merge in test for new vlan output