Changes for drive test