Get tests working with python3 again.