Griffith: Drug testing is move to clean-up Police Service