Add test driver.
Merge remote-tracking branch 'tmp/develop' into develop