Also fix the test-suite for py3