Fixes to make python3 compatible and test properly without tox