Adjusted Print methods and Test driver.