Should now pass for python3 as well