Should fix tests for py3