Update decorators, update tox.ini