Adapt the test shortcuts to the renamed switches.