New tests and comments polishing.