Updated print tests to squash a few bugs