Improve messaging in switch expiry test

We now provide the switch name in the test so you can see at a glance
which has expired.