Senate gives teachers choice of raise or tenure