last adjustments on comments and comment tests