Added more comment-related tests