Comment tests and fixes