replace all incidences of opts with config
add additional comment tests