Some clean up and precisions in TestDriver

Some clean up and precisions in TestDriver