Clean up testsuite a little

- Remove some redundant or useless tests
- Rename 'simple_vlan' tests for clarity