Tests now run with tox and pytest

Change-Id: I332040fac81b1a64a775359d0755ab7224b0288a