Revised policy adds voluntary drug testing