Fixed driver
Added two more test cases