Added more informative output comments and updated test files