Fix a test, add a verbose mode to the driver