Improve handling of comments

Ignore 2 failing tests