Tidy up the switchboard
Update switch tests
Merge pull request #5683 from guardian/switchboard-tidy-up

Tidy up the switchboard