Addressing some PR suggestions from loz; removing garbage output from test