Update notes for submitted changes

* Sync doc-test.conf and tox.ini with master