Slimming tox file to use new make commands
Updating test names so they don't use custom names
Making the test suit work, hopefully