Work towards getting the Python tests running again.