Fixed failing py3 tests