Test driver and changes related to it