Added wordwrap and improved all tests