New comment tests and fixes