Correct test after merge and correct support for python3