Minor corrections, removal of System.out.println from tests