Get tests passing on python3 #2.