refatoring comment tests