Removed debug code
Updated testdriver