Get tests working in python3 again.