Merge "Add test case for driver issue"