Updating tests following some work on Printing