Update tox envlist and change skeleton files to pass tests