Changes to drug, alcohol testing on city agenda today