Change to be compatible for offline/online test