Added extra unit tests in the driver