Profile testdriver and refactoring