Fix unit tests due to test-driver change