fix test + fix for python3