Refactored tests, refactored code as a result of better tests
Adding tox, removing PyTest setup command.