More conformance to STS

Single Tox Standard