Added more tests for comment parser.
Code cleanup.