#59 Convert last Comment Parsing tests and tidy up