Update tox.ini and setup.cfg

Change-Id: I14a8fb9b959819001fafbe5550284fcec7dbe78b