Add comment tests and fixes