Some updates to handle driver test having failed.