Switch test fix