Fixed most of the comment test