switcher test updated