Again fix Python 3 test errors