adding V2 support to TestDrive sample