Update test driver

Change-Id: I29ad714c0132804d74f9f399adafc5fa57664160