improvements to the test driver