Remove commented out print statements
Resolve more print statements in the unit tests.