Add support for more comments to start retest