Update switch tests