Added test programs and supported printing out comments