Make test driver more suitable for automated testing.