adding modification to reflect the combined tests run on Friday, plus RSpec header changes for shared-vlans