Fix py3 test failures.
Fix py3 test failures.

Lukasa/hyper,fredthomsen/hyper,masaori335/hyper,irvind/hyper,plucury/hyper,plucury/hyper,irvind/hyper,fredthomsen/hyper,lawnmowerlatte/hyper,jdecuyper/hyper,Lukasa/hyper,jdecuyper/hyper,lawnmowerlatte/hyper,masaori335/hyper