Clean up unit test suite; Remove print statements;