Added a test and made minor improvements to the print outs.