fix feature tests to handle new master_switch_state string