Drug testing proposed in new police contract