beamish_switch protocol logic updated and tested for (323/1292)