Update tests to not fail on Python3, update setup.py
Remove commented and not working parts