TST: more python3 fixes