Profile testdriver and refactoring

Are there any changes in that file?